From 9e4473a097d5246e85abba65ba29ec37228d2834 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Sat, 10 Feb 2024 16:08:19 +0100 Subject: [PATCH] cleanup --- .woodpecker.yml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index e12acf2..8d2bc08 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,16 +1,15 @@ when: - event: tag - - event: manual steps: build: image: git.snaile.de/snailed/xbps-builder:latest - commands: | - cp -f config.mk patches.h dmenu-flexipatch/ - bash flexipatch-finalizer/flexipatch-finalizer.sh -r -d dmenu-flexipatch -o dmenu-final - cp -f config.h dmenu-final/ - cd dmenu-final || exit 1 - make clean install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr" + commands: + - cp -f config.mk patches.h dmenu-flexipatch/ + - bash flexipatch-finalizer/flexipatch-finalizer.sh -r -d dmenu-flexipatch -o dmenu-final + - cp -f config.h dmenu-final/ + - cd dmenu-final || exit 1 + - make clean install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr" package-xbps: image: ghcr.io/void-linux/void-musl-busybox @@ -18,20 +17,21 @@ steps: - LICENSE=GPL-2.0 - SHORT_DESCRIPTION=Customized dwm - DEPENDENCIES=pango>=1.44,glibc>=2.32,libX11>=1.2,libXft>=2.3.8,libXinerama>=1.0.3,fontconfig>=2.6.0 - commands: | - xbps-create -A x86_64 \ - -H "$${CI_REPO_URL}" \ - -l "$${LICENSE}" \ - -n "$${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1" \ - -m "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" \ - -s "$${SHORT_DESCRIPTION}" \ - -D "$${DEPENDENCIES}" \ - "$${CI_WORKSPACE}/pkg" + commands: + - | + xbps-create -A x86_64 \ + -H "$${CI_REPO_URL}" \ + -l "$${LICENSE}" \ + -n "$${CI_REPO_NAME}-$${CI_COMMIT_TAG}_1" \ + -m "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" \ + -s "$${SHORT_DESCRIPTION}" \ + -D "$${DEPENDENCIES}" \ + "$${CI_WORKSPACE}/pkg" 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 @@ -53,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