Skip to content

Commit 5751cc8

Browse files
authored
build: drop usage of ubuntu 20.04 (#229)
1 parent 55063a8 commit 5751cc8

4 files changed

Lines changed: 6 additions & 83 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,16 @@ on:
88
jobs:
99
codejail_ci:
1010
name: tests
11-
runs-on: ${{ matrix.os }}
11+
runs-on: ubuntu-${{ matrix.ubuntu_version }}
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
include:
16-
- python_version: '3.11'
17-
ubuntu_version: '20.04'
18-
os: "ubuntu-20.04"
19-
- python_version: '3.11'
20-
ubuntu_version: '22.04'
21-
os: "ubuntu-22.04"
22-
- python_version: '3.11'
23-
ubuntu_version: '24.04'
24-
os: "ubuntu-24.04"
15+
python_version: ['3.11']
16+
ubuntu_version: ['22.04', '24.04']
2517

2618
steps:
2719
- uses: actions/checkout@v4
28-
- name: Parse custom apparmor profile with default feature ABI
29-
if: ${{ matrix.ubuntu_version == '20.04' }}
30-
run: sudo apparmor_parser -r -W apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-default-abi
31-
3220
- name: Parse custom apparmor profile with ABI 3.0
33-
if: ${{ matrix.ubuntu_version != '20.04' }}
3421
run: sudo apparmor_parser -r -W apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-abi3
3522

3623
- name: Build latest code changes into CI image

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG ubuntu_version="20.04"
1+
ARG ubuntu_version="24.04"
22

33
FROM ubuntu:${ubuntu_version}
44
SHELL ["/bin/bash", "-c"]
55

6-
ARG python_version="3.8"
6+
ARG python_version="3.11"
77

88
# Install Codejail Packages
99
ENV TZ=Etc/UTC

README.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ Python:
5959

6060
Ubuntu:
6161

62-
* 20.04
6362
* 22.04
6463
* 24.04
6564

@@ -88,7 +87,7 @@ Other details here that depend on your configuration:
8887

8988
1. Create the new virtualenv, using ``--copies`` so that there's a distinct Python executable to limit::
9089

91-
$ sudo python3.8 -m venv --copies <SANDENV>
90+
$ sudo python3.11 -m venv --copies <SANDENV>
9291

9392
By default, the virtualenv would just symlink against the system Python, and apparmor's default configuration on some operating systems may prevent confinement from being appled to that.
9493

apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-default-abi

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)