Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
tox.ini, tox.yml: Add ubuntu-groovy, fedora-33
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koeppe committed Aug 12, 2020
1 parent 415221a commit bc65004
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fail-fast: false
max-parallel: 20
matrix:
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
tox_packages_factor: [minimal, standard]
env:
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
Expand Down
11 changes: 5 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ setenv =
docker: BASE_TAG=latest
#
# https://hub.docker.com/_/ubuntu?tab=description
# as of 2020-01, latest=bionic=18.04, eoan=rolling=19.10, focal=devel=20.04
# as of 2020-08, latest=rolling=focal=20.04, groovy=devel=20.10
#
ubuntu: SYSTEM=debian
ubuntu: BASE_IMAGE=ubuntu
Expand All @@ -140,14 +140,12 @@ setenv =
ubuntu-xenial: IGNORE_MISSING_SYSTEM_PACKAGES=yes
ubuntu-bionic: BASE_TAG=bionic
ubuntu-bionic: IGNORE_MISSING_SYSTEM_PACKAGES=yes
ubuntu-latest: BASE_TAG=latest
ubuntu-latest: IGNORE_MISSING_SYSTEM_PACKAGES=yes
ubuntu-eoan: BASE_TAG=eoan
ubuntu-rolling: BASE_TAG=rolling
ubuntu-focal: BASE_TAG=focal
# ubuntu-focal does not have libpython3.7-dev any more
ubuntu-focal: IGNORE_MISSING_SYSTEM_PACKAGES=yes
ubuntu-devel: BASE_TAG=devel
ubuntu-groovy: BASE_TAG=groovy
ubuntu-groovy: IGNORE_MISSING_SYSTEM_PACKAGES=yes
#
# https://hub.docker.com/_/debian
#
Expand Down Expand Up @@ -176,7 +174,7 @@ setenv =
linuxmint-19.3: BASE_IMAGE=linuxmintd/mint19.3
#
# https://hub.docker.com/_/fedora
# as of 2020, latest=31, rawhide=32
# as of 2020-08, latest=32, rawhide=33
fedora: SYSTEM=fedora
fedora: BASE_IMAGE=fedora
fedora-26: BASE_TAG=26
Expand All @@ -190,6 +188,7 @@ setenv =
fedora-30: BASE_TAG=30
fedora-31: BASE_TAG=31
fedora-32: BASE_TAG=32
fedora-33: BASE_TAG=33
#
# https://hub.docker.com/_/centos
# centos-6 only has autoconf 2.63 -- too old for bootstrap; download configure tarball instead.
Expand Down

0 comments on commit bc65004

Please sign in to comment.