Skip to content
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.

Sign up for GitHub

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

qubes-dom0-packagev2.yml: use qubes-os-main.yml as a base #11

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −5
Draft

qubes-dom0-packagev2.yml: use qubes-os-main.yml as a base #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
144ad9e
qubes-dom0-packagev2.yml: use qubes-os-main.yml as a base
krystian-hebel Oct 10, 2024
7c1ca8e
TEST: qubes-builder-docker/builder.conf: change branch to main
krystian-hebel Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/qubes-dom0-packagev2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,9 @@ jobs:
branch: ${{ github.head_ref }}
tag: ${{ github.ref_name }}
run: |
cp example-configs/builder-devel.yml builder.yml
sed -i "s#^ prefix: fepitre/qubes-# prefix: QubesOS/qubes-#" builder.yml
sed -i "s#^ branch: builderv2# branch: main#" builder.yml
sed -i "s#^artifacts-dir: .*#artifacts-dir: $PWD/artifacts#" builder.yml
cp example-configs/qubes-os-main.yml builder.yml
sed -i "s#^ type: qubes# type: docker#" builder.yml
sed -i "s#^ dispvm: \"@dispvm\"# image: \"qubes-builder-fedora:latest\"#" builder.yml

branch_name=${${{ github.ref_type }}}
if [ -z "$branch_name" ]; then
Expand Down
3 changes: 2 additions & 1 deletion qubes-builder-docker/builder.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RELEASE := 4.2
SSH_ACCESS := 0
GIT_BASEURL := https://github.com
GIT_PREFIX := QubesOS/qubes-
BRANCH ?= release4.2
BRANCH := main

# Fetch repositories with depth=1
GIT_CLONE_FAST ?= 1
Expand Down Expand Up @@ -69,6 +69,7 @@ BRANCH_python_fido2 = main
BRANCH_python_qasync = master
BRANCH_python_panflute = master
BRANCH_intel_microcode = master
BRANCH_vmm_xen = main

BRANCH_efitools = main
BRANCH_sbsigntools = main
Expand Down