From 68e0da7c18230d836cd914c6ddf2721f87323d8d Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Mon, 14 Aug 2023 13:35:36 +0200 Subject: [PATCH] Move to cabin build tool --- .forgejo/workflows/build-all.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index 98c87fa..8a203b6 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -5,6 +5,7 @@ jobs: runs-on: docker container: image: alpine:edge + options: --privileged steps: - name: Install checkout dependencies @@ -13,7 +14,7 @@ jobs: uses: actions/checkout@v2 # SETUP BUILD TOOLS - name: Install tools - run: apk add abuild doas fd dateutils bash + run: apk add abuild abuild-rootbld doas cargo - name: Setup private key run: echo "${{ secrets.PRIVKEY }}" > $PWD/comcloudway@ccw.icu.rsa - name: Configure abuild @@ -24,6 +25,13 @@ jobs: run: cp comcloudway@ccw.icu.rsa.pub /etc/apk/keys - name: Add custom repo to system repos run: echo "/home/builder/packages" >> /etc/apk/repositories + # BUILD CABIN Util + - name: Fetch cabin + run: git clone https://codeberg.org/comcloudway/cabin + - name: Build cabin + run: cd cabin && cargo build --release + - name: Install cabin + run: cd cabin && cargo install --path . --root="/usr" && cd .. # SETUP BUILD USER - name: Setup build user run: adduser -D builder @@ -33,8 +41,8 @@ jobs: run: chown -R builder . - name: Setup doas run: echo permit nopass :wheel > /etc/doas.d/abuild.conf - # RUN BUILD SCRIPT - - name: Build main repo - run: doas -u builder ./build.sh repo main - - name: Build testing repo - run: doas -u builder ./build.sh repo testing + # RUN CABIN + - name: Index repo + run: cabin scan + - name: Build app packages (x86_64) + run: doas -u builder cabin build-all -a x86_64 -v -- 2.38.5