mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2025-02-09 11:45:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: unify locally build package output directory.

Browse source
This commit is contained in:
Alexandre Pujol 2024-10-07 14:05:40 +01:00
parent 31af758639
commit 4f861158cf
Failed to generate hash of commit
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -4,7 +4,7 @@ include:
- template: Security/SAST.gitlab-ci.yml - template: Security/SAST.gitlab-ci.yml
variables: variables:
PKGDEST: $CI_PROJECT_DIR/packages PKGDEST: $CI_PROJECT_DIR/.pkg
PACKAGER: 'Alexandre Pujol <alexandre@pujol.io>' PACKAGER: 'Alexandre Pujol <alexandre@pujol.io>'
stages: stages:

3
Makefile
View file

@ -120,5 +120,4 @@ serve:
clean: clean:
@rm -rf \ @rm -rf \
debian/.debhelper debian/debhelper* debian/*.debhelper debian/${PKGNAME} \ debian/.debhelper debian/debhelper* debian/*.debhelper debian/${PKGNAME} \
${PKGNAME}-*.pkg.tar.zst.sig ${PKGNAME}-*.pkg.tar.zst coverage.out \ .pkg/${PKGNAME}* ${BUILD} coverage.out
${PKGNAME}_*.* ${PKGNAME}-*.rpm ${BUILD}

2
dists/build.sh
View file

@ -8,7 +8,7 @@
set -eu -o pipefail set -eu -o pipefail
readonly COMMAND="$1" readonly COMMAND="$1"
readonly OUTPUT="${PKGDEST:-$PWD}" readonly OUTPUT=".pkg"
readonly PKGNAME=apparmor.d readonly PKGNAME=apparmor.d
VERSION="0.$(git rev-list --count HEAD)" VERSION="0.$(git rev-list --count HEAD)"
readonly VERSION readonly VERSION

10
dists/docker.sh
View file

@ -12,6 +12,7 @@ readonly PREFIX="builder-"
readonly PKGNAME=apparmor.d readonly PKGNAME=apparmor.d
readonly VOLUME=/tmp/build readonly VOLUME=/tmp/build
readonly BUILDIR=/home/build/tmp readonly BUILDIR=/home/build/tmp
readonly OUTPUT=".pkg"
readonly COMMAND="$1" readonly COMMAND="$1"
VERSION="0.$(git rev-list --count HEAD)" VERSION="0.$(git rev-list --count HEAD)"
PACKAGER="$(git config user.name) <$(git config user.email)>" PACKAGER="$(git config user.name) <$(git config user.email)>"
@ -62,7 +63,7 @@ build_in_docker_makepkg() {
fi fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh pkg docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh pkg
mv "$VOLUME/$PKGNAME"-*.pkg.* . mv "$VOLUME/$PKGNAME"-*.pkg.* "$OUTPUT"
} }
build_in_docker_dpkg() { build_in_docker_dpkg() {
@ -85,7 +86,7 @@ build_in_docker_dpkg() {
fi fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh dpkg docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh dpkg
mv "$VOLUME/$PKGNAME/${PKGNAME}_${VERSION}-1"_*.* . mv "$VOLUME/$PKGNAME/${PKGNAME}_${VERSION}-1"_*.* "$OUTPUT"
} }
build_in_docker_rpm() { build_in_docker_rpm() {
@ -104,14 +105,14 @@ build_in_docker_rpm() {
fi fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh rpm docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh rpm
mv "$VOLUME/$PKGNAME/$PKGNAME-$VERSION-"*.rpm . mv "$VOLUME/$PKGNAME/$PKGNAME-$VERSION-"*.rpm "$OUTPUT"
} }
main() { main() {
case "$COMMAND" in case "$COMMAND" in
archlinux) archlinux)
# build_in_docker_makepkg "$COMMAND" # build_in_docker_makepkg "$COMMAND"
PKGDEST=. makepkg -Cf PKGDEST="$OUTPUT" makepkg -Cf
;; ;;
debian | ubuntu | whonix) debian | ubuntu | whonix)
@ -128,4 +129,5 @@ main() {
esac esac
} }
mkdir -p "$OUTPUT"
main "$@" main "$@"

6
tests/packer/builds.pkr.hcl
View file

@ -22,7 +22,7 @@ build {
only = ["qemu.archlinux"] only = ["qemu.archlinux"]
destination = "/tmp/src/" destination = "/tmp/src/"
sources = [ sources = [
"${path.cwd}/../apparmor.d-${var.version}-1-x86_64.pkg.tar.zst", "${path.cwd}/../.pkg/apparmor.d-${var.version}-1-x86_64.pkg.tar.zst",
] ]
} }
@ -61,12 +61,12 @@ build {
} }
post-processor "vagrant" { post-processor "vagrant" {
output = "${var.base_dir}/packer_${var.prefix}${source.name}.box" output = "${var.base_dir}/packer_${var.prefix}${source.name}-${var.flavor}.box"
} }
post-processor "shell-local" { post-processor "shell-local" {
inline = [ inline = [
"vagrant box add --force --name ${var.prefix}${source.name} ${var.base_dir}/packer_${var.prefix}${source.name}.box" "vagrant box add --force --name ${var.prefix}${source.name}-${var.flavor} ${var.base_dir}/packer_${var.prefix}${source.name}-${var.flavor}.box"
] ]
} }