Skip to content

Commit 1f220b4

Browse files
committed
fix: drop ubuntu 20.04
1 parent 55063a8 commit 1f220b4

4 files changed

Lines changed: 7 additions & 87 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,23 @@ on:
88
jobs:
99
codejail_ci:
1010
name: tests
11-
runs-on: ${{ matrix.os }}
11+
runs-on: ubuntu-latest
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']
2516

2617
steps:
2718
- 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-
3219
- name: Parse custom apparmor profile with ABI 3.0
33-
if: ${{ matrix.ubuntu_version != '20.04' }}
3420
run: sudo apparmor_parser -r -W apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-abi3
3521

3622
- name: Build latest code changes into CI image
3723
run: |
3824
docker build -t openedx-codejail \
3925
--cache-to type=gha \
4026
--cache-from type=gha \
41-
--build-arg python_version=${{ matrix.python_version }} \
42-
--build-arg ubuntu_version=${{ matrix.ubuntu_version }} .
27+
--build-arg python_version=${{ matrix.python_version }} .
4328
4429
- name: Run container with custom apparmor profile and codejail CI image
4530
run: |

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="latest"
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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ Python:
5959

6060
Ubuntu:
6161

62-
* 20.04
63-
* 22.04
64-
* 24.04
62+
* 24.04 (latest)
6563

6664
Installation
6765
------------
@@ -88,7 +86,7 @@ Other details here that depend on your configuration:
8886

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

91-
$ sudo python3.8 -m venv --copies <SANDENV>
89+
$ sudo python3.11 -m venv --copies <SANDENV>
9290

9391
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.
9492

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)