build: drop usage of ubuntu 20.04 (#229)

openedx · Feb 20, 2025 · 5751cc8 · 5751cc8
1 parent 55063a8
commit 5751cc8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 83 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,29 +8,16 @@ on:
 jobs:
   codejail_ci:
     name: tests
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - python_version: '3.11'
-            ubuntu_version: '20.04'
-            os: "ubuntu-20.04"
-          - python_version: '3.11'
-            ubuntu_version: '22.04'
-            os: "ubuntu-22.04"
-          - python_version: '3.11'
-            ubuntu_version: '24.04'
-            os: "ubuntu-24.04"
+        python_version: ['3.11']
+        ubuntu_version: ['22.04', '24.04']
 
     steps:
       - uses: actions/checkout@v4
-      - name: Parse custom apparmor profile with default feature ABI
-        if: ${{ matrix.ubuntu_version == '20.04' }}
-        run: sudo apparmor_parser -r -W apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-default-abi
-
       - name: Parse custom apparmor profile with ABI 3.0
-        if: ${{ matrix.ubuntu_version != '20.04' }}
         run: sudo apparmor_parser -r -W apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-abi3
 
       - name: Build latest code changes into CI image

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
-ARG ubuntu_version="20.04"
+ARG ubuntu_version="24.04"
 
 FROM ubuntu:${ubuntu_version}
 SHELL ["/bin/bash", "-c"]
 
-ARG python_version="3.8"
+ARG python_version="3.11"
 
 # Install Codejail Packages
 ENV TZ=Etc/UTC

diff --git a/README.rst b/README.rst
@@ -59,7 +59,6 @@ Python:
 
 Ubuntu:
 
-* 20.04
 * 22.04
 * 24.04
 
@@ -88,7 +87,7 @@ Other details here that depend on your configuration:
 
 1. Create the new virtualenv, using ``--copies`` so that there's a distinct Python executable to limit::
 
-    $ sudo python3.8 -m venv --copies <SANDENV>
+    $ sudo python3.11 -m venv --copies <SANDENV>
 
    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.
 

diff --git a/apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-default-abi b/apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-default-abi
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,6 @@ Python: @@
     Ubuntu:
-    * 20.04
     * 22.04
     * 24.04
@@ Expand Down Expand Up / @@ -88,7 +87,7 @@ Other details here that depend on your configuration: @@
 . Create the new virtualenv, using ``--copies`` so that there's a distinct Python executable to limit::
-        $ sudo python3.8 -m venv --copies <SANDENV>
+        $ sudo python3.11 -m venv --copies <SANDENV>
        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.
@@ Expand Down @@