KASM-6904 Alpine: use common naming for kasmvncserver-doc package

This commit is contained in:
Dmitry Maksyoma 2025-03-13 20:19:55 +13:00
parent 254f4d38f0
commit 7f52b7ffc2
No known key found for this signature in database
3 changed files with 11 additions and 4 deletions

View file

@ -4,7 +4,7 @@ package_name = ARGV.first
DEB_PACKAGE_REGEX = %r!(?<os>[^/]+)/kasmvncserver_.+?_(?<arch>.+?).(?<format>deb)!
RPM_PACKAGE_REGEX = %r!(?<os>[^/]+)/kasmvncserver-.+?\.(?<arch>[^.]+).(?<format>rpm)!
ALPINE_PACKAGE_REGEX = %r!(?<os>[^/]+)/kasmvncserver-.+?-r\d+_(?<arch>[^.]+)\.(?<format>apk)!
ALPINE_PACKAGE_REGEX = %r!(?<os>[^/]+)/kasmvncserver-(doc-)?.+?-r\d+_(?<arch>[^.]+)\.(?<format>apk)!
if matches = package_name.match(DEB_PACKAGE_REGEX)
elsif matches = package_name.match(ALPINE_PACKAGE_REGEX)

View file

@ -3,7 +3,7 @@
is_kasmvnc() {
local package="$1";
echo "$package" | grep -qP 'kasmvncserver(_|-)[0-9]'
echo "$package" | grep -qP 'kasmvncserver(_|-)(doc-)?[0-9]'
}
detect_deb_package_arch() {

View file

@ -3,11 +3,18 @@
set -e
add_arch_to_apk_package() {
package_name=$(ls *.apk | grep -v kasmvncserver-doc)
local package_name="$1"
new_package_name=$(echo "$package_name" | sed -e 's/\(-r[[:digit:]]\+\)/\1_'$(arch)/)
$sudo_cmd mv "$package_name" "$new_package_name"
}
add_arch_to_apk_packages() {
for package_name in $(ls *.apk); do
add_arch_to_apk_package "$package_name"
done
}
os=alpine
os_codename=$(cat /etc/os-release | awk '/VERSION_ID/' | grep -o '[[:digit:]]' | tr -d '\n' | head -c 3)
apkbuild_dir=/src/alpine/kasmvncserver/
@ -16,6 +23,6 @@ cd "$apkbuild_dir" && abuild -r
[ -n "$CI" ] && sudo_cmd=sudo || sudo_cmd=
$sudo_cmd mkdir -p /src/builder/build/${os}_${os_codename}
( cd /src/alpine/packages/alpine/$(arch)/ && add_arch_to_apk_package )
( cd /src/alpine/packages/alpine/$(arch)/ && add_arch_to_apk_packages )
$sudo_cmd mv \
/src/alpine/packages/alpine/$(arch)/*.apk /src/builder/build/${os}_${os_codename}/