improve CI with new builder container

This commit is contained in:
Luca Bilke 2024-02-10 18:32:00 +01:00
parent 9a6fa10bfd
commit 258bd68d74
No known key found for this signature in database
GPG Key ID: AD6630D0A1E650AC
1 changed files with 22 additions and 26 deletions

View File

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