Skip to content

Commit

Permalink
CI: Upgrade some versions: stop using EOL macos-12 build image, use m…
Browse files Browse the repository at this point in the history 
…ore recent Ubuntu build image 22.04, use less old GCC-10 and GCC-13 for tests, use final Py3.13 release version.
  • Loading branch information
@scoder
scoder committed Oct 17, 2024
1 parent 0adfdfc commit a2b9f55
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 44 deletions.
86 changes: 43 additions & 43 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
#
# FIXME: 'cpp' tests seems to fail due to compilation errors (numpy_pythran_unit)
# in all python versions and test failures (builtin_float) in 3.5<
os: [ubuntu-20.04, windows-2019, macos-12]
os: [ubuntu-22.04, windows-2019, macos-13]
backend: [c, cpp]
python-version:
- "3.7"
Expand All @@ -50,136 +50,136 @@ jobs:
- "3.10"
- "3.11"
- "3.12"
- "3.13-dev"
- "3.13"
env: [{}]

include:
#- python-version: "3.13-dev"
#- python-version: "3.13"
# allowed_failure: true

# Ubuntu sub-jobs:
# ================
# graalpy is really slow...
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: graalpy24
backend: c
env: { NO_CYTHON_COMPILE: 1 }
allowed_failure: true
# GCC 11 (with broad language standards)
- os: ubuntu-20.04
# GCC 13 (with broad language standards)
- os: ubuntu-22.04
python-version: "3.9"
backend: c
env: { GCC_VERSION: 11, EXTRA_CFLAGS: "-std=c99" }
env: { GCC_VERSION: 13, EXTRA_CFLAGS: "-std=c99" }
extra_hash: "-c99"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.10"
backend: c
env: { GCC_VERSION: 11, EXTRA_CFLAGS: "-std=c17" }
env: { GCC_VERSION: 13, EXTRA_CFLAGS: "-std=c17" }
extra_hash: "-gcc11"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.12"
backend: c
env: { GCC_VERSION: 11, EXTRA_CFLAGS: "-std=c17" }
env: { GCC_VERSION: 13, EXTRA_CFLAGS: "-std=c17" }
extra_hash: "-gcc11"
- os: ubuntu-20.04
python-version: "3.12"
- os: ubuntu-22.04
python-version: "3.13"
backend: cpp
env: { GCC_VERSION: 11, EXTRA_CFLAGS: "-std=c++20" }
env: { GCC_VERSION: 13, EXTRA_CFLAGS: "-std=c++20" }
extra_hash: "-gcc11"
# compile all modules
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.7"
backend: c
env: { CYTHON_COMPILE_ALL: 1 }
extra_hash: "-all"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.7"
backend: cpp
env: { CYTHON_COMPILE_ALL: 1 }
extra_hash: "-all"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.11"
backend: c
env: { CYTHON_COMPILE_ALL: 1 }
extra_hash: "-all"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.11"
backend: cpp
env: { CYTHON_COMPILE_ALL: 1 }
extra_hash: "-all"
# Linting
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.9"
backend: "c,cpp"
env: { TEST_CODE_STYLE: 1, NO_CYTHON_COMPILE: 1 }
extra_hash: "-codestyle"
# Limited API
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.7"
backend: "c,cpp"
env: { LIMITED_API: "--limited-api", NO_LIMITED_COMPILE: 1, EXCLUDE: "--no-file" }
extra_hash: "-limited_api"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.8"
backend: "c,cpp"
env: { LIMITED_API: "--limited-api", NO_LIMITED_COMPILE: 1, EXCLUDE: "--no-file" }
extra_hash: "-limited_api"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.11"
backend: "c,cpp"
env: { LIMITED_API: "--limited-api", EXCLUDE: "--no-file" }
extra_hash: "-limited_api"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.12"
allowed_failure: true
backend: "c,cpp"
env: { LIMITED_API: "--limited-api", EXCLUDE: "--no-file" }
extra_hash: "-limited_api"
- os: ubuntu-20.04
python-version: "3.13-dev"
- os: ubuntu-22.04
python-version: "3.13"
allowed_failure: true
backend: "c,cpp"
env: { LIMITED_API: "--limited-api", EXCLUDE: "--no-file" }
extra_hash: "-limited_api"
# Type specs
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.12"
backend: c
env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
extra_hash: "-typespecs"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.9"
backend: c
env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
extra_hash: "-typespecs"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.8"
backend: c
env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
extra_hash: "-typespecs"
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.7"
backend: c
env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
extra_hash: "-typespecs"
# Stackless
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: "3.8"
backend: c
env: { STACKLESS: true, PY: 3 }
extra_hash: "-stackless"
# Pypy
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: pypy-3.9
backend: c
env: { NO_CYTHON_COMPILE: 1 }
- os: ubuntu-20.04
- os: ubuntu-22.04
python-version: pypy-3.10
backend: c
env: { NO_CYTHON_COMPILE: 1 }
# Free-threading
- os: ubuntu-20.04
python-version: 3.13-freethreading-dev
- os: ubuntu-22.04
python-version: 3.13-freethreading
backend: "c,cpp"
env: {}
allowed_failure: true
Expand All @@ -193,8 +193,8 @@ jobs:
env:
BACKEND: ${{ matrix.backend }}
PYTHON_VERSION: ${{ matrix.python-version }}
MACOSX_DEPLOYMENT_TARGET: 11.0
GCC_VERSION: 8
MACOSX_DEPLOYMENT_TARGET: "11.0"
GCC_VERSION: 10
USE_CCACHE: 1
CCACHE_SLOPPINESS: "pch_defines,time_macros"
CCACHE_COMPRESS: 1
Expand All @@ -208,15 +208,15 @@ jobs:

- name: Setup python
uses: actions/[email protected]
if: "!endsWith(matrix.python-version, '-freethreading-dev')"
if: "!endsWith(matrix.python-version, '-freethreading')"
with:
python-version: ${{ matrix.python-version }}

- name: Setup python from deadsnakes
uses: deadsnakes/[email protected]
if: "endsWith(matrix.python-version, '-freethreading-dev')"
if: "endsWith(matrix.python-version, '-freethreading')"
with:
python-version: 3.13-dev
python-version: "3.13"
nogil: true

- name: Compilation Cache
Expand Down Expand Up @@ -247,11 +247,11 @@ jobs:


pycoverage:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

env:
BACKEND: c,cpp
OS_NAME: ubuntu-20.04
OS_NAME: ubuntu-22.04
PYTHON_VERSION: "3.11"

steps:
Expand All @@ -274,11 +274,11 @@ jobs:
path: coverage-report-html

cycoverage:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

env:
BACKEND: c,cpp
OS_NAME: ubuntu-20.04
OS_NAME: ubuntu-22.04
PYTHON_VERSION: "3.11"

steps:
Expand Down
2 changes: 1 addition & 1 deletion Tools/ci-run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -x

GCC_VERSION=${GCC_VERSION:=8}
GCC_VERSION=${GCC_VERSION:=10}

# Set up compilers
if [[ $TEST_CODE_STYLE == "1" ]]; then
Expand Down

0 comments on commit a2b9f55

Please sign in to comment.