From 4cbe964244b36147111d39992f2d5696b5363609 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 25 Aug 2025 00:48:41 -0400 Subject: [PATCH 1/5] Upgrade to r4.3 --- .forgejo/workflows/release-build.yaml | 2 +- README.md | 8 ++++---- scripts/04_install_qubes.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index e8f9e4b..3804917 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -30,7 +30,7 @@ jobs: git clone https://github.com/QubesOS/qubes-linux-template-builder qubes-builder/qubes-src/linux-template-builder patch -d qubes-builder/qubes-src/linux-template-builder -p1 -i $GITHUB_WORKSPACE/.forgejo/patches/linux-template-builder_use-fuse.patch echo "%define _arch x86_64" >> qubes-builder/qubes-src/linux-template-builder/templates.spec - echo "4.2.0" > qubes-builder/qubes-src/linux-template-builder/version + echo "4.3.0" > qubes-builder/qubes-src/linux-template-builder/version sed "s|DISTS_VM :.*|DISTS_VM := $DIST|" -i ./qubes-builder/builder.conf cd qubes-builder make linux-template-builder diff --git a/README.md b/README.md index 5df3404..df1818b 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ cp /home/user/.abuild/*.pub /etc/apk/keys ``` mkdir work cd work -git clone https://ayakael.net/forge/qports -b +git clone https://ayakael.net/forge/qports -b ``` **3) Build all packages using `buildrepo`** @@ -123,7 +123,7 @@ export QUBESALPINE_KEYFILE= ``` mkdir work cd work -git clone https://ayakael.net/forge/qubes-builder-alpine -b +git clone https://ayakael.net/forge/qubes-builder-alpine -b ``` **2) Set-up build environment for QubesOS template build** @@ -140,9 +140,9 @@ git clone https://github.com/QubesOS/qubes-linux-template-builder qubes-builder/ ``` echo "%define _arch x86_64" >> qubes-builder/qubes-src/linux-template-builder/templates.spec -echo "4.2.0" > qubes-builder/qubes-src/linux-template-builder/version +echo "4.3.0" > qubes-builder/qubes-src/linux-template-builder/version ``` -If you want to build a different Alpine version than default, you can modify `qubes-builder/builder.conf` on line `DIST_VM` to alpine (i.e alpine320). +If you want to build a different Alpine version than default, you can modify `qubes-builder/builder.conf` on line `DIST_VM` to alpine (i.e alpine322). **4) Build template** diff --git a/scripts/04_install_qubes.sh b/scripts/04_install_qubes.sh index 90806cd..b9a12be 100755 --- a/scripts/04_install_qubes.sh +++ b/scripts/04_install_qubes.sh @@ -19,7 +19,7 @@ APKTOOLS_CACHE_DIR="${CACHEDIR}/apk_cache" ALPINELINUX_VERSION=${DIST_VER:-latest-stable} QUBESALPINE_MIRROR="${QUBESALPINE_MIRROR:-https://ayakael.net/api/packages/forge/alpine}" QUBESALPINE_KEYFILE="${QUBESALPINE_KEYFILE:-https://ayakael.net/api/packages/forge/alpine/key}" -QUBES_REL="${QUBES_REL:-r4.2}" +QUBES_REL="${QUBES_REL:-r4.3}" export APK_CACHE_DIR set -e From 8ab072b8e6c0fdc8fcf8475c159920f0b420bcd4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Dec 2025 17:32:32 -0500 Subject: [PATCH 2/5] Build for Alpine v3.23 --- .forgejo/workflows/release-build.yaml | 4 ++-- builder.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index 3804917..d18a069 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -10,7 +10,7 @@ jobs: image: alpine:latest env: QUBES_REL: r4.2 - DIST: alpine322 + DIST: alpine323 steps: - name: Environment setup run: | @@ -76,5 +76,5 @@ jobs: verbose: true token: "${{ secrets.FORGE_REPO_TOKEN }}" release-dir: ./package - release-notes: "For download of template through DNF, please go to https://ayakael.net/forge/-/packages/rpm/qubes-template-alpine320" + release-notes: "For download of template through DNF, please go to https://ayakael.net/forge/-/packages/rpm/qubes-template-alpine323" diff --git a/builder.conf b/builder.conf index 7f5481a..1d40823 100644 --- a/builder.conf +++ b/builder.conf @@ -23,7 +23,7 @@ GIT_PREFIX := QubesOS/qubes- # DISTS_VM - Choose the templates to build. Multiple templates can be defined # to build. Uncomment tempalte dist to build. -DISTS_VM := alpine322 +DISTS_VM := alpine323 COMPONENTS += builder-alpine BUILDER_PLUGINS += builder-alpine From fea89386b980eaecd40aaff3c42c38f44b6f80b6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Dec 2025 17:32:32 -0500 Subject: [PATCH 3/5] Build for Alpine v3.23 --- .forgejo/workflows/release-build.yaml | 4 ++-- builder.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index e8f9e4b..70d6427 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -10,7 +10,7 @@ jobs: image: alpine:latest env: QUBES_REL: r4.2 - DIST: alpine322 + DIST: alpine323 steps: - name: Environment setup run: | @@ -76,5 +76,5 @@ jobs: verbose: true token: "${{ secrets.FORGE_REPO_TOKEN }}" release-dir: ./package - release-notes: "For download of template through DNF, please go to https://ayakael.net/forge/-/packages/rpm/qubes-template-alpine320" + release-notes: "For download of template through DNF, please go to https://ayakael.net/forge/-/packages/rpm/qubes-template-alpine323" diff --git a/builder.conf b/builder.conf index 7f5481a..1d40823 100644 --- a/builder.conf +++ b/builder.conf @@ -23,7 +23,7 @@ GIT_PREFIX := QubesOS/qubes- # DISTS_VM - Choose the templates to build. Multiple templates can be defined # to build. Uncomment tempalte dist to build. -DISTS_VM := alpine322 +DISTS_VM := alpine323 COMPONENTS += builder-alpine BUILDER_PLUGINS += builder-alpine From 59a019371139c8ef01b0268dc68db0ad87a0581e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Dec 2025 17:36:39 -0500 Subject: [PATCH 4/5] ci: use up-to-date URL for actions --- .forgejo/workflows/release-build.yaml | 6 +++--- .forgejo/workflows/test-build-319.yaml | 2 +- .forgejo/workflows/test-build-320.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index d18a069..cca8144 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -36,7 +36,7 @@ jobs: make linux-template-builder cp qubes-src/linux-template-builder/rpm/noarch/qubes-template-*.rpm $GITHUB_WORKSPACE/. - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: qubes-template-*.rpm @@ -56,7 +56,7 @@ jobs: - name: Repo pull uses: actions/checkout@v4 - name: Package download - uses: forgejo/download-artifact@v3 + uses: actions/download-artifact@v3 - name: Package deployment run: ${{ github.workspace }}/.forgejo/bin/deploy.sh release-create: @@ -66,7 +66,7 @@ jobs: image: node:latest steps: - name: Package download - uses: forgejo/download-artifact@v3 + uses: actions/download-artifact@v3 - name: Release creation uses: actions/forgejo-release@v2.3.1 with: diff --git a/.forgejo/workflows/test-build-319.yaml b/.forgejo/workflows/test-build-319.yaml index f9f0819..35a77b2 100644 --- a/.forgejo/workflows/test-build-319.yaml +++ b/.forgejo/workflows/test-build-319.yaml @@ -35,7 +35,7 @@ jobs: make linux-template-builder cp qubes-src/linux-template-builder/rpm/noarch/qubes-template-*.rpm $GITHUB_WORKSPACE/. - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: qubes-template-*.rpm diff --git a/.forgejo/workflows/test-build-320.yaml b/.forgejo/workflows/test-build-320.yaml index 78cc47f..c9d0ad6 100644 --- a/.forgejo/workflows/test-build-320.yaml +++ b/.forgejo/workflows/test-build-320.yaml @@ -35,7 +35,7 @@ jobs: make linux-template-builder cp qubes-src/linux-template-builder/rpm/noarch/qubes-template-*.rpm $GITHUB_WORKSPACE/. - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: qubes-template-*.rpm From bc945e3429c1bd90dce4de2be6d29f7a40e32a3f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Dec 2025 17:36:39 -0500 Subject: [PATCH 5/5] ci: use up-to-date URL for actions --- .forgejo/workflows/release-build.yaml | 6 +++--- .forgejo/workflows/test-build-319.yaml | 2 +- .forgejo/workflows/test-build-320.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/release-build.yaml b/.forgejo/workflows/release-build.yaml index 70d6427..09e7151 100644 --- a/.forgejo/workflows/release-build.yaml +++ b/.forgejo/workflows/release-build.yaml @@ -36,7 +36,7 @@ jobs: make linux-template-builder cp qubes-src/linux-template-builder/rpm/noarch/qubes-template-*.rpm $GITHUB_WORKSPACE/. - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: qubes-template-*.rpm @@ -56,7 +56,7 @@ jobs: - name: Repo pull uses: actions/checkout@v4 - name: Package download - uses: forgejo/download-artifact@v3 + uses: actions/download-artifact@v3 - name: Package deployment run: ${{ github.workspace }}/.forgejo/bin/deploy.sh release-create: @@ -66,7 +66,7 @@ jobs: image: node:latest steps: - name: Package download - uses: forgejo/download-artifact@v3 + uses: actions/download-artifact@v3 - name: Release creation uses: actions/forgejo-release@v2.3.1 with: diff --git a/.forgejo/workflows/test-build-319.yaml b/.forgejo/workflows/test-build-319.yaml index f9f0819..35a77b2 100644 --- a/.forgejo/workflows/test-build-319.yaml +++ b/.forgejo/workflows/test-build-319.yaml @@ -35,7 +35,7 @@ jobs: make linux-template-builder cp qubes-src/linux-template-builder/rpm/noarch/qubes-template-*.rpm $GITHUB_WORKSPACE/. - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: qubes-template-*.rpm diff --git a/.forgejo/workflows/test-build-320.yaml b/.forgejo/workflows/test-build-320.yaml index 78cc47f..c9d0ad6 100644 --- a/.forgejo/workflows/test-build-320.yaml +++ b/.forgejo/workflows/test-build-320.yaml @@ -35,7 +35,7 @@ jobs: make linux-template-builder cp qubes-src/linux-template-builder/rpm/noarch/qubes-template-*.rpm $GITHUB_WORKSPACE/. - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: qubes-template-*.rpm