update travis.yml and corresponding matrix/jobs configuration

lucee · May 28, 2020 · 221f0fc · 221f0fc
1 parent 188245a
commit 221f0fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ before_script:
 - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
 - pip3 install -r requirements.txt
 - python3 ./generate-matrix.py >/dev/null && git diff --exit-code
-os: linux
 dist: bionic
 env:
   jobs:
@@ -13,6 +12,7 @@ env:
   - TOMCAT_VERSION=9.0 TOMCAT_JAVA_VERSION=jdk8-openjdk TOMCAT_BASE_IMAGE= LUCEE_MINOR=5.2,5.3 LUCEE_SERVER=,-nginx LUCEE_VARIANTS=,-light
   - TOMCAT_VERSION=9.0 TOMCAT_JAVA_VERSION=jdk11-openjdk TOMCAT_BASE_IMAGE= LUCEE_MINOR=5.2,5.3 LUCEE_SERVER=,-nginx LUCEE_VARIANTS=,-light
 language: python
+os: linux
 python: 3.6
 script:
 - echo $LUCEE_VERSION

diff --git a/generate-matrix.py b/generate-matrix.py
@@ -120,7 +120,7 @@ def main():
 	config = {
 		**matrix['travis'],
 		'env': {
-			'matrix': travis_env_rows,
+			'jobs': travis_env_rows,
 		},
 	}
 

diff --git a/matrix.yaml b/matrix.yaml
@@ -1,9 +1,10 @@
 travis:
-  sudo: required
   services:
     - docker
   language: python
   python: 3.6
+  dist: bionic
+  os: linux
   before_script:
     - 'echo TRAVIS_BRANCH: $TRAVIS_BRANCH'
     - 'echo TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST'