From 3630b1a20bc27e19a8de96998fd203d6a7c06352 Mon Sep 17 00:00:00 2001
From: Luca Bilke <luca@bil.ke>
Date: Sat, 10 Feb 2024 19:53:06 +0100
Subject: [PATCH] use git container to pull void-packages

---
 .woodpecker/2-build.yml | 65 +++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 39 deletions(-)

diff --git a/.woodpecker/2-build.yml b/.woodpecker/2-build.yml
index 1ae3348ee40..284ea08a700 100644
--- a/.woodpecker/2-build.yml
+++ b/.woodpecker/2-build.yml
@@ -11,39 +11,25 @@ when:
     evaluate: 'CI_PIPELINE_FILES contains PACKAGE && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
   - event: manual
 
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-    settings:
-      recursive: true
-      submodule-update-remote: true
-
 steps:
-  package-xbps:
-    image: ghcr.io/void-linux/void-buildroot-glibc
-    volumes:
-      - /var/cache/void-packages:/void-packages
-    commands: |
-      if [ -w /void-packages/hostdir ]; then
-        if [ -x xbps-src ]; then
-          git reset --hard HEAD
-          git pull
-          /void-packages/xbps-src bootstrap-update
-        else
-          git clone --depth=1 https://github.com/void-linux/void-packages /void-packages
-          /void-packages/xbps-src binary-bootstrap
-        fi
-      else 
-        echo "Cannot access /void-packages/hostdir" >&2
-        exit 1
-      fi
-      rm -rf /void-packages/srcpkgs/${PACKAGE} 2>/dev/null || true
-      cp -a srcpkgs/${PACKAGE} void-packages/srcpkgs/
-      /void-packages/xbps-src binary-bootstrap
-      /void-packages/xbps-src pkg ${PACKAGE} | grep "index: added" | cut -d '`' -f2 | cut -d "'" -f1 | tee ../packagename
+  setup:
+    image: alpine
+    commands:
+      - apk add wget tar
+      - cd /
+      - wget https://github.com/void-linux/void-packages/archive/refs/heads/master.tar.gz
+      - tar xf master.tar.gz
+      - cp -a srcpkgs/${PACKAGE} /void-packages-master/srcpkgs/
+      - cd void-packages-master
+      - ln -s / masterdir
+      - echo XBPS_BUILD_ENVIRONMENT=void-packages-ci >> etc/conf
+      - echo XBPS_ALLOW_RESTRICTED=yes >> etc/conf
+      - echo XBPS_CHROOT_CMD=ethereal >> etc/conf
+      - echo XBPS_ALLOW_CHROOT_BREAKOUT=yes >> etc/conf
 
-  publish-xbps:
-    image: ghcr.io/void-linux/void-musl-busybox
+  package-xbps:
+    image: git.snaile.de/snailed/xbps-builder:latest
+    pull: true
     environment:
       - XBPS_TARGET_ARCH=x86_64
     secrets: 
@@ -53,11 +39,12 @@ steps:
       - /var/www/xbps:/target
       - /var/cache/void-packages:/void-packages
       - /etc/woodpecker/:/etc/woodpecker:ro
-    commands: |
-      export XBPS_TARGET_ARCH
-      packagename="$(cat packagename)"
-
-      mv /void-packages/hostdir/binpkgs/$${packagename}.x86_64.xbps /target
-
-      xbps-rindex -a /target/$${packagename}.x86_64.xbps
-      xbps-rindex -S --signedby "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" --privkey /etc/woodpecker/privkey.pem /target/$${packagename}.x86_64.xbps
+    commands:
+      - export XBPS_TARGET_ARCH
+      - cp -a srcpkgs/${PACKAGE} /void-packages-master/srcpkgs/
+      - /void-packages-master/xbps-src binary-bootstrap
+      - /void-packages-master/xbps-src pkg ${PACKAGE} > pkg.log
+      - "packagename=$(cat pkg.log | grep 'index: added' | cut -d '`' -f2 | cut -d \"'\" -f1)"
+      - mv /void-packages-master/hostdir/binpkgs/$${packagename}.x86_64.xbps /target/
+      - xbps-rindex -a /target/$${packagename}.x86_64.xbps
+      - xbps-rindex -S --signedby "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" --privkey /etc/woodpecker/privkey.pem /target/*.xbps