From 802e3055d12862d0211048b89894077fd1710ba8 Mon Sep 17 00:00:00 2001
From: Luca Bilke <luca@bil.ke>
Date: Sat, 10 Feb 2024 18:27:53 +0100
Subject: [PATCH] use new builder container in CI
---
.woodpecker.yml | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 92a2b0f..59c4b21 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,16 +4,13 @@ when:
steps:
build:
- image: ghcr.io/void-linux/void-glibc
- environment:
- - DEPENDENCIES=bash findutils base-devel libX11-devel libXft-devel libXinerama-devel pango-devel
- commands: |
- xbps-install -Syu xbps $${DEPENDENCIES}
- cp -f config.mk patches.h dwm-flexipatch/
- bash flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final
- cp -f config.h dwm-final/
- cd dwm-final || exit 1
- make clean install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr"
+ image: git.snaile.de/snailed/xbps-builder:latest
+ commands:
+ - cp -f config.mk patches.h dwm-flexipatch/
+ - bash flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final
+ - cp -f config.h dwm-final/
+ - cd dwm-final || exit 1
+ - make clean install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr"
package-xbps:
image: ghcr.io/void-linux/void-musl-busybox
@@ -33,8 +30,8 @@ steps:
package-targz:
image: alpine
- commands: |
- tar czf $${CI_REPO_NAME}-$${CI_COMMIT_TAG}.tar.gz --directory=$${CI_WORKSPACE}/pkg .
+ commands:
+ - tar czf $${CI_REPO_NAME}-$${CI_COMMIT_TAG}.tar.gz --directory=$${CI_WORKSPACE}/pkg .
publish:
image: woodpeckerci/plugin-gitea-release
@@ -56,8 +53,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