From 97b1a5de538e6ea3401a1f96ce14d01742bb6a61 Mon Sep 17 00:00:00 2001 From: cloudhead Date: Mon, 29 Apr 2024 11:14:09 +0200 Subject: [PATCH] build: Move/rename build steps --- build/README.md | 4 ++-- build/{targets => TARGETS} | 0 build/{build.sh => build} | 6 +++--- build/{checksums.sh => checksums} | 0 {scripts => build}/tag | 0 build/{upload.sh => upload} | 4 ++-- build/{version.sh => version} | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename build/{targets => TARGETS} (100%) rename build/{build.sh => build} (96%) rename build/{checksums.sh => checksums} (100%) rename {scripts => build}/tag (100%) rename build/{upload.sh => upload} (94%) rename build/{version.sh => version} (100%) diff --git a/build/README.md b/build/README.md index f2c6d96d..51ec1076 100644 --- a/build/README.md +++ b/build/README.md @@ -14,7 +14,7 @@ be reproducible, byte for byte. To run the build, simply enter the following command from the repository root: - build/build.sh + build/build This will build all targets and place the output in `build/artifacts` with one sub-directory per build target. @@ -36,7 +36,7 @@ Here's an example output for a development version of Radicle: 1a8327854f16ea90491fb90e0c3291a63c4b2ab01742c8435faec7d370cacb79 radicle-1.0.0-rc.4-3-gb299f3b5-x86_64-apple-darwin.tar.xz 709ac67541ff0c0c570ac22ab2de9f98320e0cc2cc9b67f1909c014a2bb5bd49 radicle-1.0.0-rc.4-3-gb299f3b5-x86_64-unknown-linux-musl.tar.xz -A script is included in `build/checksums.sh` to output these checksums after +A script is included in `build/checksums` to output these checksums after the artifacts are built. ## Requirements diff --git a/build/targets b/build/TARGETS similarity index 100% rename from build/targets rename to build/TARGETS diff --git a/build/build.sh b/build/build similarity index 96% rename from build/build.sh rename to build/build index 100ac694..11930802 100755 --- a/build/build.sh +++ b/build/build @@ -25,7 +25,7 @@ main() { tempdir="$(mktemp -d)" gitarchive="$tempdir/heartwood-$rev.tar.gz" keypath="$(rad path)/keys/radicle.pub" - version="$(build/version.sh)" + version="$(build/version)" image=radicle-build-$version if [ ! -f "$keypath" ]; then @@ -54,7 +54,7 @@ main() { mkdir -p $outdir podman cp --overwrite radicle-build-container:/builds/. $outdir - for target in $(cat build/targets); do + for target in $(cat build/TARGETS); do echo "Signing artifacts for $target.." filename="radicle-$version-$target.tar.xz" @@ -83,7 +83,7 @@ main "$@" # Show artifact checksums. echo -build/checksums.sh +build/checksums echo echo "Build ran successfully." diff --git a/build/checksums.sh b/build/checksums similarity index 100% rename from build/checksums.sh rename to build/checksums diff --git a/scripts/tag b/build/tag similarity index 100% rename from scripts/tag rename to build/tag diff --git a/build/upload.sh b/build/upload similarity index 94% rename from build/upload.sh rename to build/upload index 22dbdaf2..c17ef171 100755 --- a/build/upload.sh +++ b/build/upload @@ -6,7 +6,7 @@ SSH_ADDRESS=${SSH_ADDRESS:-$SSH_LOGIN@files.radicle.xyz} SSH_KEY="$(rad path)/keys/radicle" main() { - version="$(build/version.sh)" + version="$(build/version)" echo "Uploading Radicle $version..." @@ -20,7 +20,7 @@ main() { scp -i $SSH_KEY build/artifacts/radicle-$version* $SSH_ADDRESS:/mnt/radicle/files/releases/$version scp -i $SSH_KEY build/artifacts/radicle.json $SSH_ADDRESS:/mnt/radicle/files/releases/$version - for target in $(cat build/targets); do + for target in $(cat build/TARGETS); do archive=/mnt/radicle/files/releases/$version/radicle-$version-$target.tar.xz symlink=/mnt/radicle/files/releases/$version/radicle-$target.tar.xz diff --git a/build/version.sh b/build/version similarity index 100% rename from build/version.sh rename to build/version