GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1127 from psgreco/master-fix-guix-gitian

Browse source 
Fix tarball names in guix and gitian builds
This commit is contained in:
Glenn Willen 2022-08-01 12:58:19 -07:00 • committed by GitHub
commit cd9d64ebff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
contrib/gitian-descriptors/assign_DISTNAME
View file

@ -5,6 +5,7 @@
# A helper script to be sourced into the gitian descriptors # A helper script to be sourced into the gitian descriptors
if RECENT_TAG="$(git describe --exact-match HEAD 2> /dev/null)"; then if RECENT_TAG="$(git describe --exact-match HEAD 2> /dev/null)"; then
RECENT_TAG="${RECENT_TAG#elements-}"
VERSION="${RECENT_TAG#v}" VERSION="${RECENT_TAG#v}"
else else
VERSION="$(git rev-parse --short=12 HEAD)" VERSION="$(git rev-parse --short=12 HEAD)"

2
contrib/guix/libexec/prelude.bash
View file

@ -50,7 +50,7 @@ fi
################ ################
VERSION="${VERSION:-$(git_head_version)}" VERSION="${VERSION:-$(git_head_version)}"
DISTNAME="${DISTNAME:-bitcoin-${VERSION}}" DISTNAME="${DISTNAME:-elements-${VERSION}}"
version_base_prefix="${PWD}/guix-build-" version_base_prefix="${PWD}/guix-build-"
VERSION_BASE="${version_base_prefix}${VERSION}" # TOP VERSION_BASE="${version_base_prefix}${VERSION}" # TOP

1
contrib/shell/git-utils.bash
View file

@ -7,6 +7,7 @@ git_root() {
git_head_version() { git_head_version() {
local recent_tag local recent_tag
if recent_tag="$(git describe --exact-match HEAD 2> /dev/null)"; then if recent_tag="$(git describe --exact-match HEAD 2> /dev/null)"; then
recent_tag="${recent_tag#elements-}"
echo "${recent_tag#v}" echo "${recent_tag#v}"
else else
git rev-parse --short=12 HEAD git rev-parse --short=12 HEAD