From 863829f67bc0ef1b53d574a455a1219445c11d48 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 7 Mar 2020 10:21:50 +0000 Subject: [PATCH 1/6] Allow the failure of x390x and update Travis job names --- .travis.yml | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46de3bac..ea6f382b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,42 +2,35 @@ language: generic matrix: include: - # Linux Python 3 - - sudo: required + - name: Linux | x86_64 + i686 | Python 3.5 + sudo: required language: python python: 3.5 services: docker env: PYTHON=python - # Linux Python 3 - - sudo: required + - name: Linux | arm64 | Python 3.5 + sudo: required language: python python: 3.5 services: docker arch: arm64 env: PYTHON=python - # Linux Python 3 - - sudo: required + - name: Linux | ppc64le | Python 3.5 + sudo: required language: python python: 3.5 services: docker arch: ppc64le env: PYTHON=python - # Linux Python 3 - - sudo: required - language: python - python: 3.5 - services: docker - arch: s390x - env: PYTHON=python - - # macOS Python 3 - - os: osx + - name: macOS | Python 3 + os: osx env: PYTHON=python3 - - os: windows + - name: Windows | Python 3.5 + os: windows language: shell before_install: - choco install python3 --version 3.5.4 --no-progress -y @@ -46,6 +39,26 @@ matrix: script: - C:\\Python35\\python ./bin/run_tests.py + - name: Linux | s390x | Python 3.5 + sudo: required + language: python + python: 3.5 + services: docker + arch: s390x + env: PYTHON=python + script: false + + allow_failures: + # must repeat the s390x job above exactly to match + - name: Linux | s390x | Python 3.5 + sudo: required + language: python + python: 3.5 + services: docker + arch: s390x + env: PYTHON=python + script: false + install: $PYTHON -m pip install -r requirements-dev.txt script: $PYTHON ./bin/run_tests.py From 38fef4e1d863355bcb13a4e62ebad86b1ea9c658 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 7 Mar 2020 10:37:21 +0000 Subject: [PATCH 2/6] Consistent build names --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea6f382b..4e26c9b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,11 @@ matrix: arch: ppc64le env: PYTHON=python - - name: macOS | Python 3 + - name: macOS | x86_64 | Python 3.x os: osx env: PYTHON=python3 - - name: Windows | Python 3.5 + - name: Windows | x86_64 | Python 3.5 os: windows language: shell before_install: From 1238c9d7e556da51b1c0ff9737cd14febb5b34f1 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 7 Mar 2020 10:38:27 +0000 Subject: [PATCH 3/6] Try 'minimal' build image --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e26c9b4..ea07dada 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: generic +language: minimal matrix: include: From d0692932fbb5ae402af88a2b63767ca08728273d Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 7 Mar 2020 10:46:26 +0000 Subject: [PATCH 4/6] Fix travis deprecation warnings --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea07dada..cb535531 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,14 @@ language: minimal -matrix: +jobs: include: - name: Linux | x86_64 + i686 | Python 3.5 - sudo: required language: python python: 3.5 services: docker env: PYTHON=python - name: Linux | arm64 | Python 3.5 - sudo: required language: python python: 3.5 services: docker @@ -18,7 +16,6 @@ matrix: env: PYTHON=python - name: Linux | ppc64le | Python 3.5 - sudo: required language: python python: 3.5 services: docker @@ -40,7 +37,6 @@ matrix: - C:\\Python35\\python ./bin/run_tests.py - name: Linux | s390x | Python 3.5 - sudo: required language: python python: 3.5 services: docker @@ -51,7 +47,6 @@ matrix: allow_failures: # must repeat the s390x job above exactly to match - name: Linux | s390x | Python 3.5 - sudo: required language: python python: 3.5 services: docker From 07fae7e0e5b462ec8633aa7ea81c17cb1fea5eb6 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 7 Mar 2020 10:52:53 +0000 Subject: [PATCH 5/6] Try neatening windows config --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb535531..aa807aff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,8 @@ jobs: language: shell before_install: - choco install python3 --version 3.5.4 --no-progress -y - install: - - C:\\Python35\\python -m pip install -r requirements-dev.txt - script: - - C:\\Python35\\python ./bin/run_tests.py + env: + - PYTHON=C:\\Python35\\python - name: Linux | s390x | Python 3.5 language: python From 93913ef2fa17d0536f238d333ed515755dc128c7 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 7 Mar 2020 11:19:52 +0000 Subject: [PATCH 6/6] Remove debugging fail on s390x --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa807aff..02b90836 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,6 @@ jobs: services: docker arch: s390x env: PYTHON=python - script: false allow_failures: # must repeat the s390x job above exactly to match @@ -50,7 +49,6 @@ jobs: services: docker arch: s390x env: PYTHON=python - script: false install: $PYTHON -m pip install -r requirements-dev.txt