From c9fbbf67fea41a568b239f42461d15a52a6b7786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Gonz=C3=A1lez?= Date: Thu, 21 Nov 2024 17:06:09 -0400 Subject: [PATCH] fixup! test: run tests for python3.12 --- .github/workflows/ci.yml | 5 +++-- ...i3 => home.sandbox.codejail-sandbox-venv.bin.python-abi3} | 4 ++-- ...ome.sandbox.codejail-sandbox-venv.bin.python-default-abi} | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) rename apparmor-profiles/{home.sandbox.codejail_sandbox-python3.bin.python-abi3 => home.sandbox.codejail-sandbox-venv.bin.python-abi3} (94%) rename apparmor-profiles/{home.sandbox.codejail_sandbox-python3.bin.python-default-abi => home.sandbox.codejail-sandbox-venv.bin.python-default-abi} (94%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d51e8334..a2c99a7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: fail-fast: false matrix: python_version: ['3.11', '3.12'] + ubuntu_version: ['20.04','22.04','24.04'] include: - ubuntu_version: '20.04' os: "ubuntu-20.04" @@ -25,11 +26,11 @@ jobs: - 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 + run: sudo apparmor_parser -r -W apparmor-profiles/home.sandbox.codejail-sandbox-venv.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 + run: sudo apparmor_parser -r -W apparmor-profiles/home.sandbox.codejail-sandbox-venv.bin.python-abi3 - name: Build latest code changes into CI image run: | diff --git a/apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-abi3 b/apparmor-profiles/home.sandbox.codejail-sandbox-venv.bin.python-abi3 similarity index 94% rename from apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-abi3 rename to apparmor-profiles/home.sandbox.codejail-sandbox-venv.bin.python-abi3 index 3183954a..8299f723 100644 --- a/apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-abi3 +++ b/apparmor-profiles/home.sandbox.codejail-sandbox-venv.bin.python-abi3 @@ -1,6 +1,6 @@ abi , #include -profile apparmor_profile /home/sandbox/codejail_sandbox-python{3.[0-9],3.[1-9][0-9]}/bin/python { +profile apparmor_profile /home/sandbox/codejail-sandbox-venv/bin/python { #include #include @@ -42,7 +42,7 @@ profile apparmor_profile /home/sandbox/codejail_sandbox-python{3.[0-9],3.[1-9][0 # Include additions to the abstraction include if exists - /home/sandbox/codejail_sandbox-python{3.[0-9],3.[1-9][0-9]}/** mr, + /home/sandbox/codejail-sandbox-venv/** mr, /tmp/codejail-*/ rix, /tmp/codejail-*/** wrix, diff --git a/apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-default-abi b/apparmor-profiles/home.sandbox.codejail-sandbox-venv.bin.python-default-abi similarity index 94% rename from apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-default-abi rename to apparmor-profiles/home.sandbox.codejail-sandbox-venv.bin.python-default-abi index 5ac108b1..560d4732 100644 --- a/apparmor-profiles/home.sandbox.codejail_sandbox-python3.bin.python-default-abi +++ b/apparmor-profiles/home.sandbox.codejail-sandbox-venv.bin.python-default-abi @@ -1,5 +1,5 @@ #include -profile apparmor_profile /home/sandbox/codejail_sandbox-python{3.[0-9],3.[1-9][0-9]}/bin/python { +profile apparmor_profile /home/sandbox/codejail-sandbox-venv/bin/python { #include #include @@ -41,7 +41,7 @@ profile apparmor_profile /home/sandbox/codejail_sandbox-python{3.[0-9],3.[1-9][0 # Include additions to the abstraction include if exists - /home/sandbox/codejail_sandbox-python{3.[0-9],3.[1-9][0-9]}/** mr, + /home/sandbox/codejail-sandbox-venv/** mr, /tmp/codejail-*/ rix, /tmp/codejail-*/** wrix,