diff --git a/.ci/detect_os_arch_package_format b/.ci/detect_os_arch_package_format index adf4a56..6b12647 100755 --- a/.ci/detect_os_arch_package_format +++ b/.ci/detect_os_arch_package_format @@ -4,7 +4,7 @@ package_name = ARGV.first DEB_PACKAGE_REGEX = %r!(?[^/]+)/kasmvncserver_.+?_(?.+?).(?deb)! RPM_PACKAGE_REGEX = %r!(?[^/]+)/kasmvncserver-.+?\.(?[^.]+).(?rpm)! -ALPINE_PACKAGE_REGEX = %r!(?[^/]+)/kasmvncserver-.+?-r\d+_(?[^.]+)\.(?apk)! +ALPINE_PACKAGE_REGEX = %r!(?[^/]+)/kasmvncserver-(doc-)?.+?-r\d+_(?[^.]+)\.(?apk)! if matches = package_name.match(DEB_PACKAGE_REGEX) elsif matches = package_name.match(ALPINE_PACKAGE_REGEX) diff --git a/.ci/upload.sh b/.ci/upload.sh index fc6aeb1..9200c8e 100644 --- a/.ci/upload.sh +++ b/.ci/upload.sh @@ -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() { diff --git a/builder/build-apk-inside-docker b/builder/build-apk-inside-docker index 75322e3..4d7841b 100755 --- a/builder/build-apk-inside-docker +++ b/builder/build-apk-inside-docker @@ -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}/