From fea89386b980eaecd40aaff3c42c38f44b6f80b6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Dec 2025 17:32:32 -0500 Subject: [PATCH 1/2] 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 bc945e3429c1bd90dce4de2be6d29f7a40e32a3f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Dec 2025 17:36:39 -0500 Subject: [PATCH 2/2] 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