-
Notifications
You must be signed in to change notification settings - Fork 1
qubes-dom0-packagev2.yml: update for latest builderv2 #15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -37,13 +37,24 @@ jobs: | |||||||||||||||||
| # docker.io was changed to docker because of conflict on containerd | ||||||||||||||||||
| run: | | ||||||||||||||||||
| sudo apt install --no-install-recommends --yes \ | ||||||||||||||||||
| createrepo-c devscripts python3-docker reprepro \ | ||||||||||||||||||
| python3-pathspec mktorrent python3-lxml python3-dateutil | ||||||||||||||||||
| createrepo-c devscripts gpg python3-docker reprepro \ | ||||||||||||||||||
| python3-pathspec mktorrent python3-lxml python3-dateutil \ | ||||||||||||||||||
|
|
||||||||||||||||||
| - name: Compile sq | ||||||||||||||||||
| run: | | ||||||||||||||||||
| sudo apt install --no-install-recommends --yes \ | ||||||||||||||||||
| build-essential capnproto clang curl git libassuan-dev libbz2-dev \ | ||||||||||||||||||
| libgpgme-dev libnpth-dev libsqlite3-dev libssl-dev nettle-dev \ | ||||||||||||||||||
| pkg-config zlib1g-dev && \ | ||||||||||||||||||
|
Comment on lines
+45
to
+48
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
| curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ | ||||||||||||||||||
| source "$HOME/.cargo/env" && \ | ||||||||||||||||||
| cargo install --version 1.3.1 --locked sequoia-sq && \ | ||||||||||||||||||
| sudo mv "$HOME/.cargo/bin/sq" /usr/local/bin/ | ||||||||||||||||||
|
|
||||||||||||||||||
| - uses: actions/checkout@v4 | ||||||||||||||||||
| with: | ||||||||||||||||||
| repository: QubesOS/qubes-builderv2 | ||||||||||||||||||
| ref: 80dd898cc0472dd99f161f1d1c7c44da64de93f2 | ||||||||||||||||||
| ref: 5327e41b3d68befc61bee87fb1ac0033662d575f | ||||||||||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add a reason for this change to commit message.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This ref was the most recent qubes-builderv2 at the time of doing this work. The point of this update was to have the ability to run the most recent Docker executors on GitHub workers, to mitigate potential incompatibilities between our current setup and the one proposed in this PR, which keeps up with the upstream. Otherwise there might be ambiguities, whether a failing build was caused by our old revision, or something else. Speaking about incompatibilities, the legacy builder support, which we still have in this repository, might become unavailable soon - for example, that's why the upstream qubes-zfs-dkms has my commit, where I removed the support for it, and it got approved. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you for the answer. |
||||||||||||||||||
| fetch-depth: 0 | ||||||||||||||||||
|
|
||||||||||||||||||
| - name: Cache Docker image and dom0 stuff | ||||||||||||||||||
|
|
@@ -184,6 +195,15 @@ jobs: | |||||||||||||||||
| cat builder.yml | ||||||||||||||||||
| echo "::endgroup::" | ||||||||||||||||||
|
|
||||||||||||||||||
| - name: Disable AppArmor | ||||||||||||||||||
| # Ubuntu runner with Fedora 42 Docker container fails due to AppArmor: | ||||||||||||||||||
| # https://github.com/fedora-cloud/docker-brew-fedora/issues/117 | ||||||||||||||||||
| uses: cisagov/action-disable-apparmor@v1 | ||||||||||||||||||
|
|
||||||||||||||||||
| - name: Disable kernel.apparmor_restrict_unprivileged_userns | ||||||||||||||||||
| # See the AppArmor failures above | ||||||||||||||||||
| run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 | ||||||||||||||||||
|
|
||||||||||||||||||
| - name: Build and package | ||||||||||||||||||
| env: | ||||||||||||||||||
| DEBUG: ${{ runner.debug == 1 && '--debug --verbose' || '' }} | ||||||||||||||||||
|
|
||||||||||||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.