Skip to content

Commit

Permalink
CI: Upgrade to Ubuntu 24.04 - apply AppArmor settings for Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
mikebeaton committed Nov 20, 2024
1 parent b341356 commit c7779e7
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
analyze-python-scripts:
name: Python Scripts
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
JOB_TYPE: ANALYZE
steps:
Expand All @@ -88,7 +88,7 @@ jobs:

analyze-docs-linux:
name: Documentation
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.repository_owner == 'acidanthera' && github.ref_name == 'master'
steps:
- uses: actions/checkout@v4
Expand All @@ -103,7 +103,7 @@ jobs:

analyze-coverity:
name: Coverity
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
JOB_TYPE: COVERITY
TOOLCHAINS: GCC
Expand Down
24 changes: 20 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,16 @@ jobs:

build-linux-clangpdb:
name: Linux CLANGPDB
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
TOOLCHAINS: CLANGPDB
steps:
- uses: actions/checkout@v4

- name: Apply Docker AppArmor settings
run: |
src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/docker-apparmor.sh) && eval "$src" || exit 1
- name: Use Docker in rootless mode.
uses: ScribeMD/[email protected]

Expand All @@ -79,12 +83,16 @@ jobs:

build-linux-gcc5:
name: Linux GCC
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
TOOLCHAINS: GCC
steps:
- uses: actions/checkout@v4

- name: Apply Docker AppArmor settings
run: |
src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/docker-apparmor.sh) && eval "$src" || exit 1
- name: Use Docker in rootless mode.
uses: ScribeMD/[email protected]

Expand All @@ -102,12 +110,16 @@ jobs:

build-linux-clangdwarf:
name: Linux CLANGDWARF
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
TOOLCHAINS: CLANGDWARF
steps:
- uses: actions/checkout@v4

- name: Apply Docker AppArmor settings
run: |
src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/docker-apparmor.sh) && eval "$src" || exit 1
- name: Use Docker in rootless mode.
uses: ScribeMD/[email protected]

Expand All @@ -125,10 +137,14 @@ jobs:

build-linux-docs:
name: Linux Docs
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

- name: Apply Docker AppArmor settings
run: |
src=$(/usr/bin/curl -LfsS https://raw.githubusercontent.com/acidanthera/ocbuild/master/docker-apparmor.sh) && eval "$src" || exit 1
- name: Use Docker in rootless mode.
uses: ScribeMD/[email protected]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/uncrustify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
jobs:
analyze-uncrustify:
name: Check Codestyle
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

Expand Down

0 comments on commit c7779e7

Please sign in to comment.