fix(build): backport changes from niri ext attempt

This commit is contained in:
pips 2025-09-22 20:51:48 +02:00
parent c6b2f65b3a
commit f70e0fa64e
4 changed files with 12 additions and 6 deletions

View file

@ -19,6 +19,7 @@ steps:
from_secret: package_token from_secret: package_token
- name: compile - name: compile
image: ${CI_FORGE_URL##https://}/${CI_REPO_OWNER}/${CI_REPO_NAME}-builder image: ${CI_FORGE_URL##https://}/${CI_REPO_OWNER}/${CI_REPO_NAME}-builder
pull: true
when: when:
- event: push - event: push
branch: ${CI_REPO_DEFAULT_BRANCH} branch: ${CI_REPO_DEFAULT_BRANCH}
@ -26,11 +27,11 @@ steps:
commands: commands:
- make compile - make compile
- name: dpkg - name: dpkg
image: ubuntu:24.04 image: ${CI_FORGE_URL##https://}/${CI_REPO_OWNER}/${CI_REPO_NAME}-builder
pull: true
when: when:
- event: push - event: push
branch: ${CI_REPO_DEFAULT_BRANCH} branch: ${CI_REPO_DEFAULT_BRANCH}
depends_on: compile
commands: commands:
- make dpkg - make dpkg
environment: environment:

View file

@ -2,7 +2,8 @@
FROM ubuntu:24.04 FROM ubuntu:24.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install curl \ apt-get install -y dpkg-deb \
make \
# other packages to build \ # other packages to build \

View file

@ -7,10 +7,10 @@ compile:
.PHONY: dpkg .PHONY: dpkg
dpkg: dpkg:
make -p deb-packagee/usr/bin/ mkdir -p deb-package/usr/bin/
cp upstream/bin deb-package/usr/bin/ cp upstream/bin deb-package/usr/bin/
chmod -R o-w deb-package/ chmod -R o-w deb-package/
sed -i "s|%date%|`date +%Y%m%d`|g" deb-package/DEBIAN/control sed -i "s|%date%|`date +%Y%m%d`|g" deb-package/DEBIAN/control
sed -i "s|%hash%|$(commit_abbrev)|g" deb-package/DEBIAN/control sed -i "s|%hash%|$(commit_abbrev)|g" deb-package/DEBIAN/control
dpkg-deb --build deb-package/ $(package) 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

View file

@ -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
}
} }