diff --git a/.travis.yml b/.travis.yml index 395de6a..a05347e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,8 @@ jobs: - env: SET=test01 - - env: SET=test01 +# On the side: test ADD_MODULES + - env: SET=test01 ADD_MODULES=ipac compiler: clang - env: VV="" SET=test01 diff --git a/README.md b/README.md index e60d93d..12e3cb8 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,9 @@ by using their well-known slugs, separated by spaces. EPICS Base (slug: `base`) will always be a dependency and will be added and compiled first. The other dependencies are added and compiled in the order they are defined in `MODULES`. +Modules needed only for specific jobs (e.g., on specific architectures) +can be added in the main configuration file by setting `ADD_MODULES` +for the specific job(s). `REPOOWNER=` sets the default GitHub owner (or organization) for all dependency modules. Useful if you want to compile against a complete set diff --git a/travis/.travis.yml.example-full b/travis/.travis.yml.example-full index b56c422..205d59d 100644 --- a/travis/.travis.yml.example-full +++ b/travis/.travis.yml.example-full @@ -50,18 +50,19 @@ script: # Define build jobs # Well-known variables to use -# SET source setup file -# EXTRA content will be added to make command line -# STATIC set to YES for static build (default: NO) -# TEST set to NO to skip running the tests (default: YES) -# VV set to make build scripts verbose (default: unset) +# SET source setup file +# ADD_MODULES extra modules (for a specific job) +# EXTRA content will be added to make command line +# STATIC set to YES for static build (default: NO) +# TEST set to NO to skip running the tests (default: YES) +# VV set to make build scripts verbose (default: unset) # Usually from setup files, but may be specified or overridden # on a job line -# MODULES list of dependency modules -# BASE branch or release tag name of the EPICS Base to use -# branch or release tag for a specific module -# ... see README for setup file syntax description +# MODULES list of dependency modules +# BASE branch or release tag name of the EPICS Base to use +# branch or release tag for a specific module +# ... see README for setup file syntax description jobs: include: diff --git a/travis/prepare.sh b/travis/prepare.sh index d0ec379..f93b18b 100755 --- a/travis/prepare.sh +++ b/travis/prepare.sh @@ -46,7 +46,7 @@ fold_end load.settings fold_start check.out.dependencies "Checking/cloning dependencies" -for mod in BASE $MODULES +for mod in BASE $MODULES $ADD_MODULES do mod_uc=${mod^^} eval add_dependency $mod_uc \${${mod_uc}:=master} @@ -202,7 +202,7 @@ echo -e "${ANSI_BLUE}Dependency module information${ANSI_RESET}" echo "Module Tag Binaries Commit" echo "-----------------------------------------------------------------------------------" -for mod in base $MODULES +for mod in base $MODULES $ADD_MODULES do mod_uc=${mod^^} eval tag=\${${mod_uc}}