3cd8a4d build: move to use `releases/` prefix — heartwood

Radicle Heartwood Protocol & Stack

build: move to use `releases/` prefix

Fintan Halpenny committed 9 months ago

commit 3cd8a4d96143ee39d536a41d8fdd650a6e49c265
parent 7d2f0e387c66f3f24b94673a2de9589407e2f946

6 files changed +12 -11

modified build/build

@@ -25,7 +25,7 @@ main() {

   rev="$(git rev-parse HEAD)"
   gitarchive="build/heartwood-$rev.tar.gz"
   keypath="$(rad path)/keys/radicle.pub"
   version="$(build/version)"
   version="$(build/version | sed 's/releases\///')"
   image=radicle-build-$version
   rust_version="$(build/rust-version)"

modified build/release

@@ -17,8 +17,8 @@ main() {

     echo "fatal: empty version number" >&2 ; exit 1
   fi
   if ! git rev-parse --verify "v$version^{tag}" >/dev/null 2>&1; then
     echo "error: '$version' is not a valid version, tag 'v$version' not found" >&2
   if ! git rev-parse --verify "releases/$version^{tag}" >/dev/null 2>&1; then
     echo "error: '$version' is not a valid version, tag 'releases/$version' not found" >&2
     exit 1
   fi

modified build/tag

@@ -3,11 +3,12 @@ set -e

 if [ $# -ne 1 ]; then
   echo "Usage: $0 <version-number>"
   echo "Produces a Git Tag under 'releases/<version-number>', signed by the 'user.signingKey' which must match `rad self --ssh-key`"
   exit 1
 fi
 version="$1"
 tag="v$version"
 tag="releases/$version"
 git_config_key="user.signingKey"

modified 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)"
   version="$(build/version | sed 's/releases\///')"
   nid="$(rad self --nid)"
   rad_url="$(rad . | sed s/rad:/rad:\\/\\//)"
   rad_remote="$rad_url/$nid"

@@ -58,7 +58,7 @@ main() {

   # `rad://z3gqcJUoA1n9HaHKufZs5FCSGazv5/<nid>`, where `<nid>` is the local Node
   # ID.
   echo "Pushing tags to ${rad_remote}.."
   git push "${rad_remote}" --tags
   git push "${rad_remote}" "releases/${version}"
   echo "Done."
 }

modified build/version

@@ -1,6 +1,6 @@

 #!/bin/sh
 if ! version="$(git describe --match='v*' --candidates=1 2>/dev/null)"; then
 if ! version="$(git describe --match='releases/*' --candidates=1 2>/dev/null)"; then
   echo "fatal: no version tag found by 'git describe'" >&2 ; exit 1
 fi
 # Remove `v` prefix from version.

modified scripts/changelog

@@ -12,7 +12,7 @@ while [ $# -gt 0 ]; do

         exit 1
       fi
       shift
       from=$(echo "$1" | sed 's/^v//')
       from=$(echo "$1" | sed 's/^releases\///')
       break
       ;;
     *)

@@ -23,13 +23,13 @@ while [ $# -gt 0 ]; do

 done
 # Current/latest tag.
 current=$(git describe --tags --match='v*' --abbrev=0)
 version=$(echo "$current" | sed 's/^v//')
 current=$(git describe --tags --match='releases/*' --abbrev=0)
 version=$(echo "$current" | sed 's/^releases\///')
 if [ -z "$from" ]; then
   previous="$(git describe --abbrev=0 HEAD^)"
 else
   previous="v$from"
   previous="releases/$from"
 fi
 if ! git rev-parse --verify "$previous^{tag}" >/dev/null 2>&1; then