diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index f5c9104..86bf83d 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -19,6 +19,7 @@ steps: from_secret: package_token - name: compile image: ${CI_FORGE_URL##https://}/${CI_REPO_OWNER}/${CI_REPO_NAME}-builder + pull: true when: - event: push branch: ${CI_REPO_DEFAULT_BRANCH} @@ -26,11 +27,11 @@ steps: commands: - make compile - name: dpkg - image: ubuntu:24.04 + image: ${CI_FORGE_URL##https://}/${CI_REPO_OWNER}/${CI_REPO_NAME}-builder + pull: true when: - event: push branch: ${CI_REPO_DEFAULT_BRANCH} - depends_on: compile commands: - make dpkg environment: diff --git a/Dockerfile.builder b/Dockerfile.builder index 5addab9..ae1bd0a 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -2,7 +2,8 @@ FROM ubuntu:24.04 RUN apt-get update && \ - apt-get install curl \ + apt-get install -y dpkg-deb \ + make \ # other packages to build \ diff --git a/Makefile b/Makefile index 254151d..98140fa 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,10 @@ compile: .PHONY: dpkg dpkg: - make -p deb-packagee/usr/bin/ + mkdir -p deb-package/usr/bin/ cp upstream/bin deb-package/usr/bin/ chmod -R o-w deb-package/ sed -i "s|%date%|`date +%Y%m%d`|g" deb-package/DEBIAN/control sed -i "s|%hash%|$(commit_abbrev)|g" deb-package/DEBIAN/control dpkg-deb --build deb-package/ $(package) - @curl --user CIBot:$(PASSWORD) $(package) $(CI_FORGE_URL)/api/packages/$(CI_REPO_OWNER)/debian/pool/noble/main/upload + @curl --user CIBot:$(password) --upload-file $(package) $(CI_FORGE_URL)/api/packages/$(CI_REPO_OWNER)/debian/pool/noble/main/upload diff --git a/renovate.json b/renovate.json index 9775346..b3d6670 100644 --- a/renovate.json +++ b/renovate.json @@ -1,3 +1,7 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json" + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "git-submodules": { + "enabled": true, + "automerge": true + } }