From 67d4a6a41a6d910a33940f662dcfb590ad250f56 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Dec 2025 16:37:25 -0500 Subject: [PATCH 1/2] ci: drop v3.21, add v3.23 workflow --- .../workflows/{build-v3.21.yaml => build-v3.23.yaml} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename .forgejo/workflows/{build-v3.21.yaml => build-v3.23.yaml} (93%) diff --git a/.forgejo/workflows/build-v3.21.yaml b/.forgejo/workflows/build-v3.23.yaml similarity index 93% rename from .forgejo/workflows/build-v3.21.yaml rename to .forgejo/workflows/build-v3.23.yaml index 85aa629..6837da0 100644 --- a/.forgejo/workflows/build-v3.21.yaml +++ b/.forgejo/workflows/build-v3.23.yaml @@ -3,7 +3,7 @@ on: types: [ assigned, opened, synchronize, reopened ] jobs: - build-v3.21: + build-v3.23: runs-on: x86_64 container: image: alpinelinux/alpine-gitlab-ci:latest @@ -12,7 +12,7 @@ jobs: CI_DEBUG_BUILD: ${{ runner.debug }} CI_MERGE_REQUEST_PROJECT_URL: ${{ github.server_url }}/${{ github.repository }} CI_MERGE_REQUEST_TARGET_BRANCH_NAME: ${{ github.base_ref }} - CI_ALPINE_TARGET: v3.21 + CI_ALPINE_TARGET: v3.23 steps: - name: Environment setup run: | @@ -32,13 +32,13 @@ jobs: name: package path: packages - deploy-v3.21: - needs: [build-v3.21] + deploy-v3.23: + needs: [build-v3.23] runs-on: x86_64 container: image: alpine:latest env: - CI_ALPINE_TARGET: v3.21 + CI_ALPINE_TARGET: v3.23 CI_ALPINE_REPO: 'https://ayakael.net/api/packages/forge/alpine' FORGE_REPO_TOKEN: ${{ secrets.FORGE_REPO_TOKEN }} FORGE_REPO_USER: ${{ vars.FORGE_REPO_USER }} -- 2.49.1 From 4777fd5c511af6790e8e1a7d036b7597c2629ac4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 16 Dec 2025 16:39:23 -0500 Subject: [PATCH 2/2] *: rebuild for v3.23 --- git-remote-qubes/APKBUILD | 2 +- qubes-app-linux-druide-antidote/APKBUILD | 2 +- qubes-db-vm/APKBUILD | 2 +- qubes-gpg-split/APKBUILD | 2 +- qubes-input-proxy/APKBUILD | 2 +- qubes-libvchan-xen/APKBUILD | 2 +- qubes-meta-packages/APKBUILD | 2 +- qubes-pass/APKBUILD | 2 +- qubes-usb-proxy/APKBUILD | 2 +- qubes-vm-core/APKBUILD | 2 +- qubes-vm-gui-dev/APKBUILD | 2 +- qubes-vm-gui/APKBUILD | 2 +- qubes-vm-qrexec/APKBUILD | 2 +- qubes-vm-utils/APKBUILD | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/git-remote-qubes/APKBUILD b/git-remote-qubes/APKBUILD index abfc981..017700c 100644 --- a/git-remote-qubes/APKBUILD +++ b/git-remote-qubes/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=git-remote-qubes pkgver=0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Inter-VM Git for Qubes OS" url="https://github.com/Rudd-O/git-remote-qubes" license="GPL-3.0-only" diff --git a/qubes-app-linux-druide-antidote/APKBUILD b/qubes-app-linux-druide-antidote/APKBUILD index 161d706..8765a19 100644 --- a/qubes-app-linux-druide-antidote/APKBUILD +++ b/qubes-app-linux-druide-antidote/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-app-linux-druide-antidote pkgver=0.0.1_git20240201 _gittag=c724c88aa2a20b1e422b464499015ff05753316d -pkgrel=4 +pkgrel=5 arch="noarch" pkgdesc="Qubes Druide-Antidote is a Qubes Application. It send a file to the Antidote Qube, invoke Antidote, and retrieve the file" url=https://github.com/neowutran/qubes-app-linux-druide-antidote diff --git a/qubes-db-vm/APKBUILD b/qubes-db-vm/APKBUILD index 16f94f4..a68fdba 100644 --- a/qubes-db-vm/APKBUILD +++ b/qubes-db-vm/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-db-vm subpackages="$pkgname-openrc" pkgver=4.3.1 -pkgrel=2 +pkgrel=3 _gittag="v$pkgver" pkgdesc="QubesDB libs and daemon service." arch="x86_64" diff --git a/qubes-gpg-split/APKBUILD b/qubes-gpg-split/APKBUILD index a464d39..f90a461 100644 --- a/qubes-gpg-split/APKBUILD +++ b/qubes-gpg-split/APKBUILD @@ -4,7 +4,7 @@ pkgname=qubes-gpg-split subpackages="$pkgname-doc" pkgver=2.0.80 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="Used Qubes AppVM as a “smart card”" arch="x86_64" url="https://github.com/QubesOS/qubes-app-linux-split-gpg" diff --git a/qubes-input-proxy/APKBUILD b/qubes-input-proxy/APKBUILD index 5edcd85..d08c4ce 100644 --- a/qubes-input-proxy/APKBUILD +++ b/qubes-input-proxy/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-input-proxy pkgver=1.0.44 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="The Qubes service for proxying input devices" arch="x86_64" url="https://github.com/QubesOS/qubes-app-linux-input-proxy" diff --git a/qubes-libvchan-xen/APKBUILD b/qubes-libvchan-xen/APKBUILD index 0e66336..0d4963d 100644 --- a/qubes-libvchan-xen/APKBUILD +++ b/qubes-libvchan-xen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=qubes-libvchan-xen pkgver=4.2.7 -pkgrel=2 +pkgrel=3 _gittag=v$pkgver pkgdesc="The Qubes core libraries for installation inside a Qubes Dom0 and VM." arch="x86_64" diff --git a/qubes-meta-packages/APKBUILD b/qubes-meta-packages/APKBUILD index 8b8c0fa..abd8c71 100644 --- a/qubes-meta-packages/APKBUILD +++ b/qubes-meta-packages/APKBUILD @@ -7,7 +7,7 @@ subpackages=" " pkgver=4.3.4 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="Meta packages for Qubes-specific components" arch="noarch" url="https://github.com/QubesOS/qubes-meta-packages" diff --git a/qubes-pass/APKBUILD b/qubes-pass/APKBUILD index 67e0b60..68df164 100644 --- a/qubes-pass/APKBUILD +++ b/qubes-pass/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-pass pkgver=0.1.0 _gittag="v$pkgver" -pkgrel=6 +pkgrel=7 pkgdesc="An inter-VM password manager for Qubes OS" arch="noarch" url="https://github.com/Rudd-O/qubes-pass" diff --git a/qubes-usb-proxy/APKBUILD b/qubes-usb-proxy/APKBUILD index cb6ec16..3f1ef89 100644 --- a/qubes-usb-proxy/APKBUILD +++ b/qubes-usb-proxy/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-usb-proxy pkgver=4.3.2 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="The Qubes service for proxying USB devices" arch="noarch" url="https://github.com/QubesOS/qubes-app-linux-usb-proxy" diff --git a/qubes-vm-core/APKBUILD b/qubes-vm-core/APKBUILD index f2c7545..dd02043 100644 --- a/qubes-vm-core/APKBUILD +++ b/qubes-vm-core/APKBUILD @@ -9,7 +9,7 @@ subpackages=" $pkgname-pyc " pkgver=4.3.34 -pkgrel=0 +pkgrel=1 _gittag="v$pkgver" pkgdesc="The Qubes core files for installation inside a Qubes VM." arch="x86_64" diff --git a/qubes-vm-gui-dev/APKBUILD b/qubes-vm-gui-dev/APKBUILD index 3eccd86..dc3536f 100644 --- a/qubes-vm-gui-dev/APKBUILD +++ b/qubes-vm-gui-dev/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-vm-gui-dev pkgver=4.3.1 _gittag="v$pkgver" -pkgrel=1 +pkgrel=2 pkgdesc="Common files for Qubes GUI - protocol headers." arch="noarch" url="https://github.com/QubesOS/qubes-gui-common" diff --git a/qubes-vm-gui/APKBUILD b/qubes-vm-gui/APKBUILD index 1f10b76..84658f3 100644 --- a/qubes-vm-gui/APKBUILD +++ b/qubes-vm-gui/APKBUILD @@ -6,7 +6,7 @@ subpackages=" qubes-vm-pipewire $pkgname-openrc" pkgver=4.3.13 -pkgrel=0 +pkgrel=1 _gittag="v$pkgver" pkgdesc="The Qubes GUI Agent for AppVMs" arch="x86_64" diff --git a/qubes-vm-qrexec/APKBUILD b/qubes-vm-qrexec/APKBUILD index 514d73b..0bdc2bb 100644 --- a/qubes-vm-qrexec/APKBUILD +++ b/qubes-vm-qrexec/APKBUILD @@ -4,7 +4,7 @@ pkgname=qubes-vm-qrexec subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" pkgver=4.3.11 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="The Qubes qrexec files (qube side)" arch="x86_64" url="https://github.com/QubesOS/qubes-core-qrexec" diff --git a/qubes-vm-utils/APKBUILD b/qubes-vm-utils/APKBUILD index a0d8fa3..a872af7 100644 --- a/qubes-vm-utils/APKBUILD +++ b/qubes-vm-utils/APKBUILD @@ -7,7 +7,7 @@ subpackages=" $pkgname-pyc " pkgver=4.3.13 -pkgrel=0 +pkgrel=1 _gittag="v$pkgver" pkgdesc="Common Linux files for Qubes VM." arch="x86_64" -- 2.49.1