Skip to content

Commit 0c7fbf7

Browse files
committed
ci: upgrade ubuntu runners for reproducible builds
1 parent dd6a87a commit 0c7fbf7

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

.github/workflows/reproducible-builds.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
- "cli_enterprise_linux_arm64"
2727
- "cli_enterprise_windows_amd64"
2828
runner:
29+
- "ubuntu-24.04"
2930
- "ubuntu-22.04"
30-
- "ubuntu-20.04"
3131
deps:
3232
- conventional
3333
- eccentric
@@ -97,12 +97,24 @@ jobs:
9797
- "aws_aws-nitro-tpm_console"
9898
- "qemu_qemu-vtpm_debug"
9999
- "gcp_gcp-sev-snp_nightly"
100-
runner: ["ubuntu-22.04", "ubuntu-20.04"]
100+
runner: ["ubuntu-24.04", "ubuntu-22.04"]
101101
env:
102102
bazel_target: "//image/system:${{ matrix.target }}"
103103
binary: "osimage-${{ matrix.target }}-${{ matrix.runner }}"
104104
runs-on: ${{ matrix.runner }}
105105
steps:
106+
- name: Remove security hardening features
107+
if: matrix.runner == 'ubuntu-24.04'
108+
shell: bash
109+
run: |
110+
# Taken from https://github.com/systemd/mkosi/blob/fcacc94b9f72d9b6b1f03779b0c6e07209ceb54b/action.yaml#L42-L57.
111+
sudo sysctl --ignore --write kernel.apparmor_restrict_unprivileged_unconfined=0
112+
sudo sysctl --ignore --write kernel.apparmor_restrict_unprivileged_userns=0
113+
# This command fails with a non-zero error code even though it unloads the apparmor profiles.
114+
# https://gitlab.com/apparmor/apparmor/-/issues/403
115+
sudo aa-teardown || true
116+
sudo apt-get remove -y apparmor
117+
106118
- name: Checkout
107119
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
108120
with:

0 commit comments

Comments
 (0)