From 9a50ae0354f92fa7e7f427c77e85a46b9967010f Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 22 Jul 2024 13:06:01 -0300 Subject: [PATCH] http: Rename compressed and extracted files from `radicle` to `radicle-httpd` --- radicle-httpd/build/Dockerfile | 2 +- radicle-httpd/build/build | 2 +- radicle-httpd/build/upload | 6 +++--- scripts/install-binaries | 26 ++++++++++++++++++++------ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/radicle-httpd/build/Dockerfile b/radicle-httpd/build/Dockerfile index 6c9df56e0..63cc183b3 100644 --- a/radicle-httpd/build/Dockerfile +++ b/radicle-httpd/build/Dockerfile @@ -79,7 +79,7 @@ COPY --from=builder /src/*.1 /builds/x86_64-apple-darwin/man/man1/ # Create and compress reproducible archive. WORKDIR /builds RUN apk update && apk add --no-cache tar xz -RUN find * -maxdepth 0 -type d -exec mv '{}' "radicle-$RADICLE_VERSION-{}" \; && \ +RUN find * -maxdepth 0 -type d -exec mv '{}' "radicle-httpd-$RADICLE_VERSION-{}" \; && \ find * -maxdepth 0 -type d -exec tar \ --sort=name \ --verbose \ diff --git a/radicle-httpd/build/build b/radicle-httpd/build/build index c2e471e9f..8632aea5e 100755 --- a/radicle-httpd/build/build +++ b/radicle-httpd/build/build @@ -82,7 +82,7 @@ main() { for target in $(cat build/TARGETS); do echo "Signing artifacts for $target.." - filename="radicle-$version-$target.tar.xz" + filename="radicle-httpd-$version-$target.tar.xz" filepath="$outdir/$filename" # Output SHA256 digest of archive. diff --git a/radicle-httpd/build/upload b/radicle-httpd/build/upload index a4e17efb4..598aed488 100755 --- a/radicle-httpd/build/upload +++ b/radicle-httpd/build/upload @@ -18,11 +18,11 @@ main() { # Create remote folder. ssh -i $SSH_KEY $SSH_ADDRESS mkdir -p /mnt/radicle/files/releases/radicle-httpd/$version # Copy files over. - scp -i $SSH_KEY build/artifacts/radicle-$version* $SSH_ADDRESS:/mnt/radicle/files/releases/radicle-httpd/$version + scp -i $SSH_KEY build/artifacts/radicle-httpd-$version* $SSH_ADDRESS:/mnt/radicle/files/releases/radicle-httpd/$version for target in $(cat build/TARGETS); do - archive=/mnt/radicle/files/releases/radicle-httpd/$version/radicle-$version-$target.tar.xz - symlink=/mnt/radicle/files/releases/radicle-httpd/$version/radicle-$target.tar.xz + archive=/mnt/radicle/files/releases/radicle-httpd/$version/radicle-httpd-$version-$target.tar.xz + symlink=/mnt/radicle/files/releases/radicle-httpd/$version/radicle-httpd-$target.tar.xz echo "Creating symlinks for $target.." diff --git a/scripts/install-binaries b/scripts/install-binaries index 40f223bb9..f38f94d1d 100755 --- a/scripts/install-binaries +++ b/scripts/install-binaries @@ -14,17 +14,31 @@ install() { mkdir -p "$BINARY_PATH/$1/$2" case "$OS" in Darwin) - echo Downloading "$1" v"$2" from "https://files.radicle.xyz/releases$3/$2/radicle-aarch64-apple-darwin.tar.xz into /tests/tmp/bin/$1/$2" - curl --fail -s "https://files.radicle.xyz/releases$3/$2/radicle-aarch64-apple-darwin.tar.xz" | tar -xJ --strip-components=2 -C "$BINARY_PATH/$1/$2" "radicle-$2-aarch64-apple-darwin/bin/" || (echo "Download failed" && exit 1) + ARCH="aarch64-apple-darwin" ;; Linux) - echo Downloading "$1" v"$2" from "https://files.radicle.xyz/releases$3/$2/radicle-x86_64-unknown-linux-musl.tar.xz into /tests/tmp/bin/$1/$2" - curl --fail -s "https://files.radicle.xyz/releases$3/$2/radicle-x86_64-unknown-linux-musl.tar.xz" | tar -xJ --strip-components=2 -C "$BINARY_PATH/$1/$2" "radicle-$2-x86_64-unknown-linux-musl/bin/" || (echo "Download failed" && exit 1) + ARCH="x86_64-unknown-linux-musl" ;; *) echo "There are no precompiled binaries for your OS: $OS, compile $1 manually and make sure it's in PATH." && exit 1 ;; esac + case "$1" in + heartwood) + FETCH_URL="https://files.radicle.xyz/releases/$2/radicle-$ARCH.tar.xz" + FILENAME="radicle-$2-$ARCH" + ;; + httpd) + FETCH_URL="https://files.radicle.xyz/releases/radicle-httpd/$2/radicle-httpd-$ARCH.tar.xz" + FILENAME="radicle-httpd-$2-$ARCH" + ;; + *) + echo "No precompiled binary found with the name $1." && exit 1 + ;; + esac + + echo Downloading "$1" v"$2" from "$FETCH_URL into /tests/tmp/bin/$1/$2" + curl --fail -s "$FETCH_URL" | tar -xJ --strip-components=2 -C "$BINARY_PATH/$1/$2" "$FILENAME/bin/" || (echo "Download failed" && exit 1) fi } @@ -49,7 +63,7 @@ while [ $# -ne 0 ]; do esac done -install "heartwood" "$RELEASE" "" -install "httpd" "$HTTPD_RELEASE" "/radicle-httpd" +install "heartwood" "$RELEASE" +install "httpd" "$HTTPD_RELEASE" echo