Skip to content

Commit

Permalink
Use Debian Bookworm and Python 3.11 everywhere in CI and devcontainer
Browse files Browse the repository at this point in the history
  • Loading branch information
F30 committed May 25, 2024
1 parent d64864b commit 9f14cf9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "python:3.9-alpine",
"image": "python:3.11-alpine",
"updateContentCommand": "apk --no-cache add git curl build-base jpeg-dev zlib-dev iputils-ping",
"postCreateCommand": "pip3 install --editable .[dev] && make dev",
"customizations": {
Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
lint:
name: Lint soure code
runs-on: ubuntu-latest
container: python:3.11-bullseye
container: python:3.11-bookworm
steps:
- uses: actions/checkout@v3
- run: pip install -e .[dev]
Expand All @@ -18,7 +18,7 @@ jobs:
test_tox:
name: Test with Tox
runs-on: ubuntu-latest
container: python:3.11-bullseye
container: python:3.11-bookworm
permissions:
# Required for "EnricoMi/publish-unit-test-result-action"
checks: write
Expand Down Expand Up @@ -58,14 +58,11 @@ jobs:
build_deb_package:
name: Build Debian package
runs-on: ubuntu-latest
container: debian:bullseye
container: debian:bookworm
steps:
- uses: actions/checkout@v3
- run: echo 'deb http://deb.debian.org/debian/ bullseye-backports main' >> /etc/apt/sources.list
- run: apt-get --yes update
- run: apt-get --yes install --no-install-recommends devscripts dpkg-dev equivs
# It's a bit ugly to do this explicitly, but we really need Django from backports
- run: apt-get --yes install -t bullseye-backports python3-django
# Add `--yes` to mk-build-deps' default options for apt-get
- run: mk-build-deps --install --tool 'apt-get --yes -o Debug::pkgProblemResolver=yes --no-install-recommends' debian/control
- run: dpkg-buildpackage --unsigned-changes --unsigned-buildinfo
Expand All @@ -81,17 +78,14 @@ jobs:
test_debian:
name: Test with Debian
runs-on: ubuntu-latest
container: debian:bullseye
container: debian:bookworm
needs: build_deb_package
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
with:
name: deb-package
- run: echo 'deb http://deb.debian.org/debian/ bullseye-backports main' >> /etc/apt/sources.list
- run: apt-get --yes update
# It's a bit ugly to do this explicitly, but we really need Django from backports
- run: apt-get --yes install -t bullseye-backports python3-django
# Install our package in order to install its dependencies
- run: apt-get --yes install --no-install-recommends ./ctf-gameserver_*.deb
- run: apt-get --yes install make curl unzip python3-pytest python3-pytest-cov
Expand Down

0 comments on commit 9f14cf9

Please sign in to comment.