Merge branch 'ci-initial-316' into 'v3.16'

gitlab-ci: initial v3.16

See merge request ayakael/user-aports!2

.gitlab-ci.yml

@@ -19,7 +19,7 @@ lint:
   only:
     - merge_requests
   tags:
-    - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+    - apk-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 build:
   stage: build
@@ -40,7 +40,7 @@ build:
   only:
     - merge_requests
   tags:
-    - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+    - apk-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 push:
   interruptible: true
@@ -50,11 +50,11 @@ push:
       artifacts: true
   script:
     - |
-      sudo apk add git abuild
+      sudo apk add abuild git-lfs
       export PATH="$PATH:$CI_PROJECT_DIR/.gitlab/bin"
       push.sh
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: manual
   tags:
-    - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+    - apk-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME

.gitlab/bin/build.sh

@@ -7,7 +7,7 @@
 set -eu -o pipefail
 
 readonly APORTSDIR=$CI_PROJECT_DIR
-readonly REPOS="cross backports user"
+readonly REPOS="backports user"
 readonly ALPINE_REPOS="main community testing"
 readonly ARCH=$(apk --print-arch)
 # gitlab variables
@@ -70,8 +70,8 @@ report() {
 
 get_release() {
 	case $BASEBRANCH in
-		v*) echo v"${BASEBRANCH%-*}";;
-		master) echo edge;;
+		v*) echo "${BASEBRANCH%-*}";;
+		edge) echo edge;;
 		*) die "Branch \"$BASEBRANCH\" not supported!"
 	esac
 }

.gitlab/bin/push.sh

@@ -8,7 +8,7 @@
 set -eu -o pipefail
 
 readonly APORTSDIR=$CI_PROJECT_DIR
-readonly REPOS="cross backports user"
+readonly REPOS="backports user"
 readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
@@ -23,7 +23,7 @@ echo "PACKAGER_PRIVKEY=$HOME/.abuild/key.rsa" >> $HOME/.abuild/abuild.conf
 echo "REPODEST=$CI_PROJECT_DIR/repo-apk" >> $HOME/.abuild/abuild.conf
 doas cp $HOME/.abuild/key.rsa.pub /etc/apk/keys/.
 
-git clone git@lab.ilot.io:ayakael/repo-apk -b $CI_MERGE_REQUEST_PROJECT_URL
+git clone git@lab.ilot.io:ayakael/repo-apk -b $BASEBRANCH
 for i in $(find packages -type f -name "*.apk"); do
 	cp $i ${i/packages/repo-apk}
 done

user/py3-iso639/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=py3-iso639
 _pkgname=iso639
 pkgver=0.4.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Python library for ISO 639 standard"
 arch='noarch'
 url="https://github.com/noumar/iso639"