Skip to content

Commit 8b5e87f

Browse files
committed
switch from ubuntu-latest to ubuntu-24.04
avoid the complicated version detection
1 parent 4e07982 commit 8b5e87f

File tree

3 files changed

+7
-106
lines changed

3 files changed

+7
-106
lines changed

.github/workflows/bwrap.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
pass1:
1616
name: Run up to Linux build under bubblewrap
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- name: Install bubblewrap
2020
run: sudo apt install bubblewrap
@@ -26,7 +26,7 @@ jobs:
2626
# against a commit != HEAD with depth=1, it errors out.
2727
fetch-depth: 0
2828
- name: Work around Ubuntu 24.04 bubblewrap bug
29-
run: bash .github/workflows/ubuntu_bwrap_fix.sh
29+
run: sudo cp .github/workflows/bwrap.apparmor /etc/apparmor.d/bwrap && sudo systemctl reload apparmor
3030
- name: Query cache for sources
3131
id: cache
3232
uses: actions/cache/restore@v4
@@ -63,7 +63,7 @@ jobs:
6363
pass2:
6464
name: Run up to Python bootstrap under bubblewrap
6565
needs: pass1
66-
runs-on: ubuntu-latest
66+
runs-on: ubuntu-24.04
6767
steps:
6868
- name: Install bubblewrap
6969
run: sudo apt install bubblewrap
@@ -75,7 +75,7 @@ jobs:
7575
# against a commit != HEAD with depth=1, it errors out.
7676
fetch-depth: 0
7777
- name: Work around Ubuntu 24.04 bubblewrap bug
78-
run: bash .github/workflows/ubuntu_bwrap_fix.sh
78+
run: sudo cp .github/workflows/bwrap.apparmor /etc/apparmor.d/bwrap && sudo systemctl reload apparmor
7979
- name: Get pass1_image
8080
uses: actions/download-artifact@v4
8181
with:
@@ -118,7 +118,7 @@ jobs:
118118
pass3:
119119
name: Run remaining builds under bubblewrap
120120
needs: pass2
121-
runs-on: ubuntu-latest
121+
runs-on: ubuntu-24.04
122122
steps:
123123
- name: Install bubblewrap
124124
run: sudo apt install bubblewrap
@@ -130,7 +130,7 @@ jobs:
130130
# against a commit != HEAD with depth=1, it errors out.
131131
fetch-depth: 0
132132
- name: Work around Ubuntu 24.04 bubblewrap bug
133-
run: bash .github/workflows/ubuntu_bwrap_fix.sh
133+
run: sudo cp .github/workflows/bwrap.apparmor /etc/apparmor.d/bwrap && sudo systemctl reload apparmor
134134
- name: Get pass2_image
135135
uses: actions/download-artifact@v4
136136
with:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Checkout repo
3131
uses: actions/checkout@v3
3232
- name: shellcheck
33-
run: shellcheck steps/helpers.sh download-distfiles.sh .github/workflows/ubuntu_bwrap_fix.sh
33+
run: shellcheck steps/helpers.sh download-distfiles.sh
3434

3535
reuse:
3636
name: Lint reuse information

.github/workflows/ubuntu_bwrap_fix.sh

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)