Skip to content

Commit

Permalink
use ci-scripts
Browse files Browse the repository at this point in the history
also test Linux 5.5
  • Loading branch information
mdavidsaver committed Apr 30, 2020
1 parent 0a62d13 commit b0bdb78
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 122 deletions.
1 change: 1 addition & 0 deletions .ci
Submodule .ci added at 4484a9
File renamed without changes.
11 changes: 11 additions & 0 deletions .ci-local/defaults.set
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# EPICS Base
BASE_DIRNAME=base
BASE_REPONAME=epics-base
BASE_REPOOWNER=epics-base
BASE_VARNAME=EPICS_BASE
BASE_RECURSIVE=no

MODULES=DEVLIB2

DEVLIB2_REPONAME=devlib2
DEVLIB2_REPOOWNER=epics-modules
File renamed without changes.
12 changes: 0 additions & 12 deletions .ci/build-epics.sh

This file was deleted.

105 changes: 0 additions & 105 deletions .ci/prepare-epics.sh

This file was deleted.

3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule ".ci"]
path = .ci
url = https://github.com/epics-base/ci-scripts
30 changes: 25 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
language: c
language: cpp
compiler: gcc
dist: xenial

cache:
directories:
- $HOME/.cache

env:
global:
- SETUP_PATH=.ci-local

addons:
apt:
packages:
- libreadline6-dev
- libncurses5-dev
- perl
- clang

matrix:
include:
Expand All @@ -24,10 +42,12 @@ matrix:
env: KSER=4.x KVER=4.9.1 EXTRA="-C mrmShared/linux KERNELDIR=$HOME/linux"
- dist: xenial
env: KSER=4.x KVER=4.19.67 EXTRA="-C mrmShared/linux KERNELDIR=$HOME/linux"
- dist: xenial
env: KSER=5.x KVER=5.5.19 EXTRA="-C mrmShared/linux KERNELDIR=$HOME/linux"

install:
- ./.ci/prepare-epics.sh
- ./.ci/prepare-linux.sh
- if [ "$BASE" ]; then ./.ci/travis/prepare.sh; fi
- ./.ci-local/prepare-linux.sh
script:
- ./.ci/build-epics.sh
- ./.ci/build-linux.sh
- if [ "$BASE" ]; then ./.ci/travis/build.sh; fi
- ./.ci-local/build-linux.sh

0 comments on commit b0bdb78

Please sign in to comment.