diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 971d962..19168aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,14 +39,6 @@ lint: only: - merge_requests -build-v3.18: - extends: .build - when: always - variables: - CI_ALPINE_TARGET_RELEASE: v3.18 - tags: - - apk-$CI_ALPINE_TARGET_RELEASE-x86_64 - build-v3.19: extends: .build when: always @@ -55,6 +47,14 @@ build-v3.19: tags: - apk-$CI_ALPINE_TARGET_RELEASE-x86_64 +build-v3.20: + extends: .build + when: always + variables: + CI_ALPINE_TARGET_RELEASE: v3.20 + tags: + - apk-$CI_ALPINE_TARGET_RELEASE-x86_64 + build-edge: extends: .build when: always diff --git a/qubes-app-linux-druide-antidote/APKBUILD b/qubes-app-linux-druide-antidote/APKBUILD index dd234f1..3a6cce4 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=0 +pkgrel=1 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 b31b236..48f390c 100644 --- a/qubes-db-vm/APKBUILD +++ b/qubes-db-vm/APKBUILD @@ -1,10 +1,9 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-db-vm subpackages="$pkgname-openrc" pkgver=4.2.4 -pkgrel=3 +pkgrel=4 _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 4d704c8..a3fbbca 100644 --- a/qubes-gpg-split/APKBUILD +++ b/qubes-gpg-split/APKBUILD @@ -1,11 +1,10 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-gpg-split subpackages="$pkgname-doc" pkgver=2.0.70 _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-libvchan-xen/APKBUILD b/qubes-libvchan-xen/APKBUILD index 45adfb0..f26d637 100644 --- a/qubes-libvchan-xen/APKBUILD +++ b/qubes-libvchan-xen/APKBUILD @@ -1,9 +1,8 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-libvchan-xen pkgver=4.2.3 -pkgrel=0 +pkgrel=1 _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 a41f1af..9831571 100644 --- a/qubes-meta-packages/APKBUILD +++ b/qubes-meta-packages/APKBUILD @@ -1,6 +1,5 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-meta-packages subpackages=" qubes-vm-dependencies @@ -8,7 +7,7 @@ subpackages=" " pkgver=4.2.11 _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 77142e3..85e5703 100644 --- a/qubes-pass/APKBUILD +++ b/qubes-pass/APKBUILD @@ -1,10 +1,9 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-pass pkgver=0.1.0 _gittag="v$pkgver" -pkgrel=2 +pkgrel=3 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 b93ee50..69c1005 100644 --- a/qubes-usb-proxy/APKBUILD +++ b/qubes-usb-proxy/APKBUILD @@ -1,10 +1,9 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-usb-proxy pkgver=1.2.1 _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 f0c2df4..eaec588 100644 --- a/qubes-vm-core/APKBUILD +++ b/qubes-vm-core/APKBUILD @@ -1,6 +1,5 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-vm-core subpackages=" qubes-vm-networking:networking:noarch @@ -10,7 +9,7 @@ subpackages=" $pkgname-pyc " pkgver=4.2.29 -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 ad5390a..9501734 100644 --- a/qubes-vm-gui-dev/APKBUILD +++ b/qubes-vm-gui-dev/APKBUILD @@ -1,10 +1,9 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-vm-gui-dev pkgver=4.2.4 _gittag="v$pkgver" -pkgrel=2 +pkgrel=3 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 4acf6c0..7ee20d8 100644 --- a/qubes-vm-gui/APKBUILD +++ b/qubes-vm-gui/APKBUILD @@ -1,13 +1,12 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-vm-gui subpackages=" qubes-vm-pulseaudio qubes-vm-pipewire $pkgname-openrc" pkgver=4.2.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 5eb9671..399d3e4 100644 --- a/qubes-vm-qrexec/APKBUILD +++ b/qubes-vm-qrexec/APKBUILD @@ -1,11 +1,10 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-vm-qrexec subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" pkgver=4.2.18 _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 399d398..b262070 100644 --- a/qubes-vm-utils/APKBUILD +++ b/qubes-vm-utils/APKBUILD @@ -1,6 +1,5 @@ -# Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) - +# Maintainer: Antoine Martin (ayakael) pkgname=qubes-vm-utils subpackages=" qubes-vm-kernel-support:support:noarch @@ -8,7 +7,7 @@ subpackages=" $pkgname-pyc " pkgver=4.2.15 -pkgrel=1 +pkgrel=2 _gittag="v$pkgver" pkgdesc="Common Linux files for Qubes VM." arch="x86_64"