From a7102e8ea7a5c4b55720562da4010e5d09e27b3d Mon Sep 17 00:00:00 2001 From: Michal Biesek Date: Mon, 7 Aug 2023 17:16:06 +0200 Subject: [PATCH 1/3] github: simplify `release.yml` Signed-off-by: Michal Biesek --- .github/workflows/release.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9d2b0501f..e43c5b783 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,14 +28,10 @@ jobs: - run: | sudo mv release-* /tmp/artifact - sudo mv /tmp/artifact/crun-*-linux-amd64 /tmp/artifact/crun-linux-amd64 - sudo mv /tmp/artifact/crun-*-linux-amd64-disable-systemd /tmp/artifact/crun-linux-amd64-disable-systemd - sudo mv /tmp/artifact/crun-*-linux-arm64 /tmp/artifact/crun-linux-arm64 - sudo mv /tmp/artifact/crun-*-linux-arm64-disable-systemd /tmp/artifact/crun-linux-arm64-disable-systemd - sudo mv /tmp/artifact/crun-*-linux-ppc64le /tmp/artifact/crun-linux-ppc64le - sudo mv /tmp/artifact/crun-*-linux-ppc64le-disable-systemd /tmp/artifact/crun-linux-ppc64le-disable-systemd - sudo mv /tmp/artifact/crun-*-linux-riscv64 /tmp/artifact/crun-linux-riscv64 - sudo mv /tmp/artifact/crun-*-linux-riscv64-disable-systemd /tmp/artifact/crun-linux-riscv64-disable-systemd + for ARCH in amd64 arm64 ppc64le riscv64; do + sudo mv /tmp/artifact/crun-*-linux-${ARCH} /tmp/artifact/crun-linux-${ARCH} + sudo mv /tmp/artifact/crun-*-linux-${ARCH}-disable-systemd /tmp/artifact/crun-linux-${ARCH}-disable-systemd + done sudo mv /tmp/artifact/*.tar.gz /tmp/artifact/crun.tar.gz sudo mv /tmp/artifact/*.tar.xz /tmp/artifact/crun.tar.xz (cd /tmp/artifact; sha256sum * | sudo tee CHECKSUMS) From 5224aa2ec32f2d1ef747ac1ad5e8acd10678b304 Mon Sep 17 00:00:00 2001 From: Michal Biesek Date: Mon, 7 Aug 2023 17:18:11 +0200 Subject: [PATCH 2/3] build-aux: simplify `release.sh` Signed-off-by: Michal Biesek --- build-aux/release.sh | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/build-aux/release.sh b/build-aux/release.sh index 60563d041..c6d3ef325 100755 --- a/build-aux/release.sh +++ b/build-aux/release.sh @@ -57,41 +57,19 @@ cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-amd64-disable-systemd rm -rf result -$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ - nix $NIX_ARGS build --file nix/default-arm64.nix -cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-arm64 - -rm -rf result - -$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ - nix $NIX_ARGS build --file nix/default-arm64.nix --arg enableSystemd false -cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-arm64-disable-systemd - -rm -rf result - -$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ - nix $NIX_ARGS build --file nix/default-ppc64le.nix -cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-ppc64le - -rm -rf result - -$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ - nix $NIX_ARGS build --file nix/default-ppc64le.nix --arg enableSystemd false -cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-ppc64le-disable-systemd - -rm -rf result +for ARCH in arm64 ppc64le riscv64; do + $RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ + nix $NIX_ARGS build --file nix/default-${ARCH}.nix + cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-${ARCH} -$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ - nix $NIX_ARGS build --file nix/default-riscv64.nix -cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-riscv64 + rm -rf result -rm -rf result + $RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ + nix $NIX_ARGS build --file nix/default-${ARCH}.nix --arg enableSystemd false + cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-${ARCH}-disable-systemd -$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ - nix $NIX_ARGS build --file nix/default-riscv64.nix --arg enableSystemd false -cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-riscv64-disable-systemd - -rm -rf result + rm -rf result +done if test x$SKIP_GPG = x; then for i in $OUTDIR/*; do From 57a252b78662f49486f2e3a82e876776231dbba3 Mon Sep 17 00:00:00 2001 From: Michal Biesek Date: Mon, 7 Aug 2023 22:53:23 +0200 Subject: [PATCH 3/3] nix: rename `default-nix` to `default-amd64.nix` Signed-off-by: Michal Biesek --- build-aux/release.sh | 14 +------------- nix/{default.nix => default-amd64.nix} | 0 2 files changed, 1 insertion(+), 13 deletions(-) rename nix/{default.nix => default-amd64.nix} (100%) diff --git a/build-aux/release.sh b/build-aux/release.sh index c6d3ef325..87c6d6d9b 100755 --- a/build-aux/release.sh +++ b/build-aux/release.sh @@ -45,19 +45,7 @@ mkdir -p /nix NIX_ARGS="--extra-experimental-features nix-command --print-build-logs --option cores $(nproc) --option max-jobs $(nproc)" -$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ - nix $NIX_ARGS build --file nix/ -cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-amd64 - -rm -rf result - -$RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ - nix $NIX_ARGS build --file nix/ --arg enableSystemd false -cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-amd64-disable-systemd - -rm -rf result - -for ARCH in arm64 ppc64le riscv64; do +for ARCH in amd64 arm64 ppc64le riscv64; do $RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ nix $NIX_ARGS build --file nix/default-${ARCH}.nix cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-${ARCH} diff --git a/nix/default.nix b/nix/default-amd64.nix similarity index 100% rename from nix/default.nix rename to nix/default-amd64.nix