README: update

.gitlab/bin/push.sh

@@ -8,7 +8,7 @@
 set -eu -o pipefail
 
 readonly APORTSDIR=$CI_PROJECT_DIR
-readonly REPOS="ilot"
+readonly REPOS="backports user"
 readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
@@ -20,19 +20,19 @@ chmod 700 "$HOME"/.ssh/id_rsa
 chmod 700 "$HOME"/.abuild/$ABUILD_KEY_NAME.rsa
 
 echo "PACKAGER_PRIVKEY=$HOME/.abuild/$ABUILD_KEY_NAME.rsa" > $HOME/.abuild/abuild.conf
-echo "REPODEST=$HOME/apk" >> $HOME/.abuild/abuild.conf
+echo "REPODEST=$HOME/repo-apk" >> $HOME/.abuild/abuild.conf
 sudo cp $HOME/.abuild/$ABUILD_KEY_NAME.rsa.pub /etc/apk/keys/.
 
-if [ -d $HOME/apk ]; then
-	git -C $HOME/apk fetch
-	git -C $HOME/apk checkout $BASEBRANCH
-	git -C $HOME/apk pull --rebase
+if [ -d $HOME/repo-apk ]; then
+	git -C $HOME/repo-apk fetch
+	git -C $HOME/repo-apk checkout $BASEBRANCH
+	git -C $HOME/repo-apk pull --rebase
 else
-	git clone git@lab.ilot.io:ilot/apk -b $BASEBRANCH $HOME/apk
+	git clone git@lab.ilot.io:ayakael/repo-apk -b $BASEBRANCH $HOME/repo-apk
 fi
 
 for i in $(find packages -type f -name "*.apk"); do
-	install -vDm644 $i ${i/packages/$HOME\/apk}
+	install -vDm644 $i ${i/packages/$HOME\/repo-apk}
 done
 
 fetch_flags="-qn"
@@ -40,17 +40,17 @@ git fetch $fetch_flags "$CI_MERGE_REQUEST_PROJECT_URL" \
 	"+refs/heads/$BASEBRANCH:refs/heads/$BASEBRANCH"
 
 for repo in $(changed_repos); do
-	rm $HOME/apk/$repo/*/APKINDEX.tar.gz | true
+	rm $HOME/repo-apk/$repo/*/APKINDEX.tar.gz | true
 	mkdir -p $repo/DUMMY
 	echo "pkgname=DUMMY" > $repo/DUMMY/APKBUILD
 	cd $repo/DUMMY
-	for i in $(find $HOME/apk/$repo -maxdepth 1 -mindepth 1 -printf '%P '); do
+	for i in $(find $HOME/repo-apk/$repo -maxdepth 1 -mindepth 1 -printf '%P '); do
 		CHOST=$i abuild index
 	done
 	cd "$CI_PROJECT_DIR"
 	rm -R $repo/DUMMY
 done
 
-git -C $HOME/apk add .
-git -C $HOME/apk commit -m "Update from $CI_MERGE_REQUEST_IID - $CI_MERGE_REQUEST_TITLE"
-git -C $HOME/apk push
+git -C $HOME/repo-apk add .
+git -C $HOME/repo-apk commit -m "Update from $CI_MERGE_REQUEST_IID - $CI_MERGE_REQUEST_TITLE"
+git -C $HOME/repo-apk push

README.md

@@ -1,19 +1,18 @@
-# user-aports
-Upstream: https://lab.ilot.io/ayakael/user-aports
+# iports
+Upstream: https://codeberg.org/ilot/iports
 
 ## Description
 
 This repository contains aports that are not yet merged in the official Alpine
 Linux repository or don’t adhere to Alpine polices. Packages are automatically
-built using GitLab CI on my own GitLab instance. Once built, they are deployed
-to a git-lfs repository, making them available to apk.
+built using CI. Once built, they are deployed to a git-lfs repository, making
+them available to apk.
 
 Branches are matched to Alpine releases.
 
-
 ## Repositories
 
-You can browse all the repositories at https://lab.ilot.io/ayakael/repo-apk.
+You can browse all the repositories at https://codeberg.org/ilot/iports
 Affixed to each repository description is the appropriate link for use in
 `/etc/apk/repositories`.
 
@@ -24,13 +23,13 @@ https://lab.ilot.io/ayakael/repo-apk/-/raw/edge/backports
 
 Aports from the official Alpine repositories backported from edge.
 
-#### User
+#### Ilot
 ```
 https://lab.ilot.io/ayakael/repo-apk/-/raw/edge/user
 ```
 
 Aports that have yet to be (or may never be) upstreamed to the official
-aports.
+aports and that are used by ilot coop.
 
 
 ## How to use
@@ -52,12 +51,13 @@ they will work for you.
 
 ## Contribution & bug reports
 If you wish to contribute to this aports collection, or wish to report a bug,
-you can do so on Alpine's GitLab instance here:
-https://gitlab.alpinelinux.org/ayakael/user-aports
+you can do so on Codeberg here:
+https://codeberg.org/ilot/iports/issues
 
-For packages that are in testing/community, bug reports and merge requests
+For packages that are in backports, bug reports and merge requests
 should be done on Alpine's aports repo instance:
 https://gitlab.alpinelinux.org/alpine/aports
 
 ## License
 This readme, abuilds and support scripts are licensed under MIT License.
+