3 files changed, 9 insertions(+), 6 deletions(-)

M .build.yml
M .woodpecker.yml
M build.sh

@@ 16,10 16,10 @@ secrets:
   - cb16ed57-2486-4afc-be50-8bbcd3fae405
   # aports pubkey
   - f0aa24db-26a9-4b3d-b379-eee7429fd6f6
-artifacts:
-  - ./packages
 tasks:
   - setup: echo 'PACKAGER_PRIVKEY=$HOME/.abuild/comcloudway@ccw.icu.rsa' >> $HOME/.abuild/abuild.conf
   - build: |
       cd ccw-aports
       ./build.sh repo main
+  - package: |
+    # TODO: Add task to upload artifacts in current repo

@@ 3,11 3,12 @@ pipeline:
   build:
     image: alpine:edge
     commands:
-      - echo "$whoami"
       - apk update
       - apk add fd bash abuild dateutils
       - mkdir -p $HOME/.abuild
-      - echo '$PACKAGE_SIGNATURE' > $PWD/comcloudway@ccw.icu.rsa
-      - echo 'PACKAGER_PRIVKEY=$PWD/comcloudway@ccw.icu.rsa' >> $HOME/.abuild/abuild.conf
+      - echo "$PACKAGE_SIGNATURE" > $CI_WORKSPACE/comcloudway@ccw.icu.rsa
+      - echo "PACKAGER_PRIVKEY=$CI_WORKSPACE/comcloudway@ccw.icu.rsa" >> /root/.abuild/abuild.conf
+      - cp "$CI_WORKSPACE/comcloudway@ccw.icu.rsa.pub" /etc/apk/keys/
+      - export ABUILD_FLAGS="$ABUILD_FLAGS -F"
       - ./build.sh all
     secrets: [ package_signature ]

@@ 1,6 1,8 @@
 #!/bin/sh
 # Needs: fd, bash, abuild, dateutils
 
+export ABUILD_FLAGS="$ABUILD_FLAGS"
+
 set -eu -o pipefail
 
 # Build a specific package


@@ 13,7 15,7 @@ function build_package() {
     echo ">>> Building $pkg from $repo"
 
     cd $repo/$pkg
-    abuild -r
+    abuild -r $ABUILD_FLAGS
 
     cd ../..
     end="$( date | awk -F ' ' '{ print $4 }' )"