Skip to content

Commit b102a70

Browse files
committed
qubes-dom0-packagev2.yml: update for latest builderv2
The updated building workflow is meant to be ran on a GitHub worker with Ubuntu 24.04. For this case the workflow disables AppArmor and, given the required recent Sequoia release, installs Rust with the recommended method available at https://rust-lang.org/tools/install/. Signed-off-by: Kamil Aronowski <kamil.aronowski@3mdeb.com>
1 parent 917c561 commit b102a70

1 file changed

Lines changed: 23 additions & 3 deletions

File tree

.github/workflows/qubes-dom0-packagev2.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,24 @@ jobs:
3737
# docker.io was changed to docker because of conflict on containerd
3838
run: |
3939
sudo apt install --no-install-recommends --yes \
40-
createrepo-c devscripts python3-docker reprepro \
41-
python3-pathspec mktorrent python3-lxml python3-dateutil
40+
createrepo-c devscripts gpg python3-docker reprepro \
41+
python3-pathspec mktorrent python3-lxml python3-dateutil \
42+
43+
- name: Compile sq
44+
run: |
45+
sudo apt install --no-install-recommends --yes \
46+
build-essential capnproto clang curl git libassuan-dev libbz2-dev \
47+
libgpgme-dev libnpth-dev libsqlite3-dev libssl-dev nettle-dev \
48+
pkg-config zlib1g-dev && \
49+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
50+
source "$HOME/.cargo/env" && \
51+
cargo install --version 1.3.1 --locked sequoia-sq && \
52+
sudo mv "$HOME/.cargo/bin/sq" /usr/local/bin/
4253
4354
- uses: actions/checkout@v4
4455
with:
4556
repository: QubesOS/qubes-builderv2
46-
ref: 80dd898cc0472dd99f161f1d1c7c44da64de93f2
57+
ref: 5327e41b3d68befc61bee87fb1ac0033662d575f
4758
fetch-depth: 0
4859

4960
- name: Cache Docker image and dom0 stuff
@@ -184,6 +195,15 @@ jobs:
184195
cat builder.yml
185196
echo "::endgroup::"
186197
198+
- name: Disable AppArmor
199+
# Ubuntu runner with Fedora 42 Docker container fails due to AppArmor:
200+
# https://github.com/fedora-cloud/docker-brew-fedora/issues/117
201+
uses: cisagov/action-disable-apparmor@v1
202+
203+
- name: Disable kernel.apparmor_restrict_unprivileged_userns
204+
# See the AppArmor failures above
205+
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
206+
187207
- name: Build and package
188208
env:
189209
DEBUG: ${{ runner.debug == 1 && '--debug --verbose' || '' }}

0 commit comments

Comments
 (0)