diff options
| author | Olly Betts <olly@survex.com> | 2022-03-17 15:30:21 +1300 |
|---|---|---|
| committer | Olly Betts <olly@survex.com> | 2022-03-17 18:55:10 +1300 |
| commit | c7af8eabb3334063c9cede2916b14f23920082d7 (patch) | |
| tree | 1f4beaf3a603e3a9e601108ddf6bbfb76d8ed575 /.github | |
| parent | 2da3815f998a3488995fec5d1a7583da395ac2fa (diff) | |
| download | swig-c7af8eabb3334063c9cede2916b14f23920082d7.tar.gz | |
Default to running tests with Python 3
Specify PY2=1 to use Python 2.
See #1779
Closes #2235
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fd4fbe9d..88fd32328 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: # By default, the name of the build is the language used and SWIG options, but matrix entries # can define the additional "desc" field with any additional information to include in the name. - name: ${{ matrix.SWIGLANG || 'none' }}${{ matrix.PY3 }} ${{ matrix.ENGINE}} ${{ matrix.VER }} ${{ matrix.SWIG_FEATURES }} ${{ (matrix.compiler || 'gcc') }}${{ matrix.GCC }} ${{ matrix.CPPSTD }} ${{ matrix.CSTD }} ${{ matrix.desc }} ${{ matrix.continue-on-error && '(can fail)' }} + name: ${{ matrix.SWIGLANG || 'none' }}${{ matrix.PY2 }} ${{ matrix.ENGINE}} ${{ matrix.VER }} ${{ matrix.SWIG_FEATURES }} ${{ (matrix.compiler || 'gcc') }}${{ matrix.GCC }} ${{ matrix.CPPSTD }} ${{ matrix.CSTD }} ${{ matrix.desc }} ${{ matrix.continue-on-error && '(can fail)' }} strategy: matrix: @@ -113,45 +113,37 @@ jobs: - SWIGLANG: php VER: '8.1' - SWIGLANG: python + PY2: 2 - SWIGLANG: python - PY3: 3 VER: '3.2' os: ubuntu-18.04 # Python < 3.5 not available for 20.04. - SWIGLANG: python - PY3: 3 VER: '3.3' os: ubuntu-18.04 # Python < 3.5 not available for 20.04. - SWIGLANG: python - PY3: 3 VER: '3.4' os: ubuntu-18.04 # Python < 3.5 not available for 20.04. - SWIGLANG: python - PY3: 3 VER: '3.5' - SWIGLANG: python - PY3: 3 VER: '3.6' - SWIGLANG: python - PY3: 3 VER: '3.7' - SWIGLANG: python - PY3: 3 VER: '3.8' - SWIGLANG: python - PY3: 3 VER: '3.9' - SWIGLANG: python - PY3: 3 VER: '3.10' - SWIGLANG: python + PY2: 2 SWIG_FEATURES: -builtin - SWIGLANG: python + PY2: 2 SWIG_FEATURES: -builtin -O - SWIGLANG: python - PY3: 3 SWIG_FEATURES: -builtin - SWIGLANG: python - PY3: 3 SWIG_FEATURES: -builtin -O - SWIGLANG: r - SWIGLANG: ruby @@ -210,7 +202,6 @@ jobs: CSTD: gnu11 - SWIGLANG: python CPPSTD: c++11 - PY3: 3 - SWIGLANG: r CPPSTD: c++11 - SWIGLANG: ruby @@ -245,7 +236,6 @@ jobs: CSTD: gnu11 - SWIGLANG: python CPPSTD: c++14 - PY3: 3 - SWIGLANG: r CPPSTD: c++14 - SWIGLANG: ruby @@ -290,7 +280,6 @@ jobs: - SWIGLANG: python CPPSTD: c++17 GCC: 11 - PY3: 3 - SWIGLANG: r CPPSTD: c++17 GCC: 11 @@ -314,7 +303,7 @@ jobs: env: SWIGLANG: ${{ matrix.SWIGLANG }} - PY3: ${{ matrix.PY3 }} + PY2: ${{ matrix.PY2 }} VER: ${{ matrix.VER }} ENGINE: ${{ matrix.ENGINE }} SWIG_FEATURES: ${{ matrix.SWIG_FEATURES }} |