From 258bd68d7425dce1feb8bdb3469d6e10b769430c Mon Sep 17 00:00:00 2001
From: Luca Bilke <luca@bil.ke>
Date: Sat, 10 Feb 2024 18:32:00 +0100
Subject: [PATCH] improve CI with new builder container

---
 .woodpecker.yml | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9072106..3ab323a 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,13 +4,9 @@ when:
 
 steps:
   build:
-    image: gcc
-    environment:
-      - BUILD_DEPS=libxcb-util-dev
-    commands: |
-      apt-get update
-      apt-get install -y $${BUILD_DEPS}
-      make install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr"
+    image: git.snaile.de/snailed/xbps-builder:latest
+    commands:
+      - make install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr"
 
   package-xbps:
     image: ghcr.io/void-linux/void-musl-busybox
@@ -27,20 +23,20 @@ steps:
                   -c "$${CI_COMMIT_MESSAGE}" \
                   "$${CI_WORKSPACE}/pkg"
 
-  package-targz:
-    image: alpine
-    commands: |
-      tar czf $${CI_REPO_NAME}-$${CI_COMMIT_TAG}.tar.gz --directory=$${CI_WORKSPACE}/pkg .
-
-  publish:
-    image: woodpeckerci/plugin-gitea-release
-    settings:
-      base_url: https://git.snaile.de
-      files:
-        - "${CI_REPO_NAME}-${CI_COMMIT_TAG}.tar.gz"
-      api_key:
-        from_secret: gitea_release
-      target: main
+  # package-targz:
+  #   image: alpine
+  #   commands:
+  #     - tar czf $${CI_REPO_NAME}-$${CI_COMMIT_TAG}.tar.gz --directory=$${CI_WORKSPACE}/pkg .
+  #
+  # publish:
+  #   image: woodpeckerci/plugin-gitea-release
+  #   settings:
+  #     base_url: https://git.snaile.de
+  #     files:
+  #       - "${CI_REPO_NAME}-${CI_COMMIT_TAG}.tar.gz"
+  #     api_key:
+  #       from_secret: gitea_release
+  #     target: main
 
   publish-xbps:
     image: ghcr.io/void-linux/void-musl-busybox
@@ -52,8 +48,8 @@ steps:
     volumes:
       - /var/www/xbps:/target
       - /etc/woodpecker/:/etc/woodpecker:ro
-    commands: |
-      export XBPS_TARGET_ARCH
-      mv $${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1.x86_64.xbps /target
-      xbps-rindex -a /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1.x86_64.xbps
-      xbps-rindex -S --signedby "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" --privkey /etc/woodpecker/privkey.pem /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1.x86_64.xbps
+    commands:
+      - export XBPS_TARGET_ARCH
+      - mv $${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1.x86_64.xbps /target
+      - xbps-rindex -a /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1.x86_64.xbps
+      - xbps-rindex -S --signedby "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" --privkey /etc/woodpecker/privkey.pem /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1.x86_64.xbps