Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions README.rst
Original file line number Diff 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:

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.

Expand Down

This file was deleted.