Radish alpha
r
radicle-explorer
rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5
Radicle web interface
Radicle
Git
Patches › 2c225d0a
http: Rename compressed and extracted files from `radicle` to `radicle-httpd`
Merged did:key:z6MkkfM3...sVz5 opened 1 year ago

check check-visual check-unit-test check-http-client-unit-test check-radicle-httpd check-e2e check-build check-http

👉 Preview 👉 Workflow runs 👉 Branch on GitHub

Activity Changes +25 -11
4 files changed +25 -11 cd38ed11 → 9a50ae03
modified 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 \
modified 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.
modified 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.."
modified 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