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

Merge pull request #1503 from psgreco/master-buildfixes

Browse source 
Minor fixes for guix and regular builds
This commit is contained in:
Byron Hambly 2025-11-05 08:34:28 +02:00 • committed by GitHub
commit d7995d8a56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/guix/guix-build
View file

@ -238,7 +238,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f
# across time. # across time.
time-machine() { time-machine() {
# shellcheck disable=SC2086 # 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=ae03f401381e956c4c41b4cf495cbde964fa43d0 \ --commit=ae03f401381e956c4c41b4cf495cbde964fa43d0 \
--cores="$JOBS" \ --cores="$JOBS" \
--keep-failed \ --keep-failed \

2
contrib/guix/guix-codesign
View file

@ -226,7 +226,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f
# across time. # across time.
time-machine() { time-machine() {
# shellcheck disable=SC2086 # 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=ae03f401381e956c4c41b4cf495cbde964fa43d0 \ --commit=ae03f401381e956c4c41b4cf495cbde964fa43d0 \
--cores="$JOBS" \ --cores="$JOBS" \
--keep-failed \ --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) RAWDESC=$(git describe --abbrev=0 2>/dev/null)
if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 "$RAWDESC" 2>/dev/null)" ]; then if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 "$RAWDESC" 2>/dev/null)" ]; then
git diff-index --quiet HEAD -- && GIT_TAG=$RAWDESC 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 fi
# otherwise generate suffix from git, i.e. string like "59887e8-dirty" # otherwise generate suffix from git, i.e. string like "59887e8-dirty"