Skip to content

Commit

Permalink
gh-35660: CI Linux: Update platforms
Browse files Browse the repository at this point in the history
    
<!-- Please provide a concise, informative and self-explanatory title.
-->
<!-- Don't put issue numbers in the title. Put it in the Description
below. -->
<!-- For example, instead of "Fixes #12345", use "Add a new method to
multiply two integers" -->

### 📚 Description

<!-- Describe your changes here in detail. -->
- Adding the newest from `ubuntu`, `linuxmint`, `fedora`, `opensuse`.
- Test a newer 32bit platform.
- Fixing `...-python3.x-minimal` tests broken by #35638.
- A few more parallel jobs because we can.
<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes #12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x
]`. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [ ] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- #12345: short description why this is a dependency
- #34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: #35660
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik, Frédéric Chapoton
  • Loading branch information
Release Manager committed Jun 3, 2023
2 parents cacd9a8 + 00e9d18 commit dac3933
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 5 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ on:
"ubuntu-jammy",
"ubuntu-kinetic",
"ubuntu-lunar",
"ubuntu-mantic",
"debian-buster",
"debian-bullseye",
"debian-bookworm",
Expand All @@ -34,6 +35,7 @@ on:
"linuxmint-20.3",
"linuxmint-21",
"linuxmint-21.1",
"linuxmint-21.2",
"fedora-29-python3.8",
"fedora-30-python3.8",
"fedora-31",
Expand All @@ -44,6 +46,7 @@ on:
"fedora-36",
"fedora-37",
"fedora-38",
"fedora-39",
"centos-7-devtoolset-gcc_11",
"centos-stream-8-python3.9",
"centos-stream-9-python3.9",
Expand All @@ -53,10 +56,12 @@ on:
"archlinux-latest",
"opensuse-15.3-gcc_11-python3.9",
"opensuse-15.4-gcc_11-python3.10",
"opensuse-15.5-gcc_11-python3.11",
"opensuse-tumbleweed-python3.10",
"conda-forge",
"ubuntu-bionic-gcc_8-i386",
"debian-buster-i386",
"debian-bullseye-i386",
]
tox_packages_factors:
description: 'Stringified JSON object listing tox packages factors'
Expand All @@ -71,7 +76,7 @@ on:
default: ""
max_parallel:
type: number
default: 24
default: 30
free_disk_space:
default: false
type: boolean
Expand Down
23 changes: 19 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ setenv =
docker: BASE_TAG=latest
#
# https://hub.docker.com/_/ubuntu?tab=description
# as of 2023-01, latest=jammy=22.04, rolling=kinetic=22.10, devel=lunar=23.04
# as of 2023-05, latest=jammy=22.04, rolling=lunar=23.04, devel=mantic=23.10
#
ubuntu: SYSTEM=debian
ubuntu: BASE_IMAGE=ubuntu
Expand All @@ -222,6 +222,8 @@ setenv =
ubuntu-kinetic: IGNORE_MISSING_SYSTEM_PACKAGES=yes
ubuntu-lunar: BASE_TAG=lunar
ubuntu-lunar: IGNORE_MISSING_SYSTEM_PACKAGES=yes
ubuntu-mantic: BASE_TAG=mantic
ubuntu-mantic: IGNORE_MISSING_SYSTEM_PACKAGES=yes
#
# https://hub.docker.com/_/debian
# debian-bullseye does not have libgiac-dev
Expand Down Expand Up @@ -254,9 +256,10 @@ setenv =
linuxmint-20.3: BASE_IMAGE=linuxmintd/mint20.3
linuxmint-21: BASE_IMAGE=linuxmintd/mint21
linuxmint-21.1: BASE_IMAGE=linuxmintd/mint21.1
linuxmint-21.2: BASE_IMAGE=linuxmintd/mint21.2
#
# https://hub.docker.com/_/fedora
# as of 2023-01, latest=37, rawhide=38
# as of 2023-05, latest=38, rawhide=39
fedora: SYSTEM=fedora
fedora: BASE_IMAGE=fedora
fedora-26: BASE_TAG=26
Expand All @@ -282,6 +285,8 @@ setenv =
fedora-37: IGNORE_MISSING_SYSTEM_PACKAGES=yes
fedora-38: BASE_TAG=38
fedora-38: IGNORE_MISSING_SYSTEM_PACKAGES=yes
fedora-39: BASE_TAG=39
fedora-39: IGNORE_MISSING_SYSTEM_PACKAGES=yes
#
# https://hub.docker.com/r/scientificlinux/sl
#
Expand Down Expand Up @@ -323,6 +328,7 @@ setenv =
slackware: SYSTEM=slackware
slackware: BASE_IMAGE=vbatts/slackware
slackware-14.2: BASE_TAG=14.2
slackware-15.0: BASE_TAG=15.0
slackware-current: BASE_TAG=current
slackware: IGNORE_MISSING_SYSTEM_PACKAGES=no
#
Expand Down Expand Up @@ -350,7 +356,7 @@ setenv =
#
# https://hub.docker.com/r/opensuse/leap
# - OpenSUSE Leap 42 was superseded by the Leap 15 series.
# - As of 2022-07, latest = 15 = 15.4
# - As of 2023-05, latest = 15 = 15.5
# https://hub.docker.com/r/opensuse/tumbleweed
# - Rolling distribution
#
Expand All @@ -363,6 +369,7 @@ setenv =
opensuse-15.2: BASE_TAG=15.2
opensuse-15.3: BASE_TAG=15.3
opensuse-15.4: BASE_TAG=15.4
opensuse-15.5: BASE_TAG=15.5
opensuse-15: BASE_TAG=15
opensuse-tumbleweed: BASE_IMAGE=opensuse/tumbleweed
opensuse-tumbleweed: IGNORE_MISSING_SYSTEM_PACKAGES=no
Expand Down Expand Up @@ -522,7 +529,7 @@ setenv =
CONFIG_CONFIGURE_ARGS_1=--with-system-python3=yes
python3_spkg: CONFIG_CONFIGURE_ARGS_1=--without-system-python3
python3.8,python3.9,python3.10,python3.11,python3.12: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}
python3.8,python3.9,python3.10,python3.11,python3.12: EXTRA_SAGE_PACKAGES_5=_python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR} _bootstrap liblzma bzip2 libffi libpng
python3.8,python3.9,python3.10,python3.11,python3.12: EXTRA_SAGE_PACKAGES_5=_python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR} _bootstrap liblzma bzip2 libffi libpng zlib
macos-python3_xcode: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/usr/bin/python3
macos-{python3_xcode,nohomebrew}-{python3.8}: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
# Homebrew keg installs
Expand All @@ -547,6 +554,10 @@ setenv =
gcc_11: EXTRA_SAGE_PACKAGES_2=_gcc11
gcc_12: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-12 CXX=g++-12 FC=gfortran-12
gcc_12: EXTRA_SAGE_PACKAGES_2=_gcc12
gcc_13: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-13 CXX=g++-13 FC=gfortran-13
gcc_13: EXTRA_SAGE_PACKAGES_2=_gcc13
gcc_14: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-14 CXX=g++-14 FC=gfortran-14
gcc_14: EXTRA_SAGE_PACKAGES_2=_gcc14
centos-7-devtoolset: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force
centos-7-devtoolset-gcc_9: DEVTOOLSET=9
centos-7-devtoolset-gcc_10: DEVTOOLSET=10
Expand Down Expand Up @@ -577,6 +588,10 @@ setenv =
macos-11.3: MACOSX_DEPLOYMENT_TARGET=11.3
macos-12.1: MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk
macos-12.1: MACOSX_DEPLOYMENT_TARGET=12.1
macos-12.3: MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX12.3.sdk
macos-12.3: MACOSX_DEPLOYMENT_TARGET=12.3
macos-13.3: MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk
macos-13.3: MACOSX_DEPLOYMENT_TARGET=13.3
#
# Resulting full configuration args, including EXTRA_CONFIGURE_ARGS from the user environment
#
Expand Down

0 comments on commit dac3933

Please sign in to comment.