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

Merge d7995d8a56 into merged_master (Elements PR #1503)

Browse source
This commit is contained in:
Byron Hambly 2026-01-06 16:08:54 +02:00
commit df11e01f49
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ fi
# across time.
time-machine() {
# shellcheck disable=SC2086
guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
guix time-machine --url=https://codeberg.org/guix.git \
--commit=d5ca4d4fd713a9f7e17e074a1e37dda99bbb09fc \
--cores="$JOBS" \
--keep-failed \

2
share/genbuild.sh
View file

@ -28,6 +28,8 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$
RAWDESC=$(git describe --abbrev=0 2>/dev/null)
if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 "$RAWDESC" 2>/dev/null)" ]; then
git diff-index --quiet HEAD -- && GIT_TAG=$RAWDESC
# Replace elements- tag with the corresponding v
case "$GIT_TAG" in elements-*) GIT_TAG="v${GIT_TAG#elements-}";; esac
fi
# otherwise generate suffix from git, i.e. string like "59887e8-dirty"