diff --git a/radicle-httpd/build/tag b/radicle-httpd/build/tag index 7c8b3dbf5..3f2baefbe 100755 --- a/radicle-httpd/build/tag +++ b/radicle-httpd/build/tag @@ -7,7 +7,7 @@ if [ $# -ne 1 ]; then fi version="$1" -tag="v$version" +tag="releases/$version" commit="$(git rev-parse HEAD)" signing_key=$(git config user.signingKey) diff --git a/radicle-httpd/build/upload b/radicle-httpd/build/upload index e0bdb35b8..49787ae01 100755 --- a/radicle-httpd/build/upload +++ b/radicle-httpd/build/upload @@ -32,7 +32,7 @@ main() { ssh -i $SSH_KEY $SSH_ADDRESS ln -snf $archive.sha256 $symlink.sha256 done - if git describe --exact-match --match='v*' 2>/dev/null; then + if git describe --exact-match --match='releases/*' 2>/dev/null; then echo "Creating 'latest' symlink.." ssh -i $SSH_KEY $SSH_ADDRESS ln -snf /var/www/files.radicle.xyz/releases/radicle-httpd/$version /var/www/files.radicle.xyz/releases/radicle-httpd/latest else diff --git a/radicle-httpd/build/version b/radicle-httpd/build/version index 4383147c1..08b4e920e 100755 --- a/radicle-httpd/build/version +++ b/radicle-httpd/build/version @@ -1,9 +1,9 @@ #!/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. -version=${version#v} +# Remove `releases/` prefix from version. +version=${version#releases/} echo $version