forge/ayaports
1
0
Fork 0
Code Issues 44 Pull requests 15 Projects Releases Packages Wiki Activity Actions

gitlab-ci: update to new runner config

Browse source
This commit is contained in:
Antoine Martin 2023-02-10 05:37:40 +00:00 committed by Antoine Martin
parent b69267291f
commit 1cbc0f3bce
Signed by: forge
GPG key ID: D62A472A4AA7D541
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

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

6
.gitlab/bin/build.sh
View file

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

4
.gitlab/bin/push.sh
View file

@ -8,7 +8,7 @@
set -eu -o pipefail set -eu -o pipefail
readonly APORTSDIR=$CI_PROJECT_DIR readonly APORTSDIR=$CI_PROJECT_DIR
readonly REPOS="cross backports user" readonly REPOS="backports user"
readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" 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 echo "REPODEST=$CI_PROJECT_DIR/repo-apk" >> $HOME/.abuild/abuild.conf
doas cp $HOME/.abuild/key.rsa.pub /etc/apk/keys/. 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 for i in $(find packages -type f -name "*.apk"); do
cp $i ${i/packages/repo-apk} cp $i ${i/packages/repo-apk}
done done

2
user/py3-iso639/APKBUILD
View file

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