Browse Source

Merge #7522: Bugfix: Only use git for build info if the repository is actually the right one

ed1fcdc Bugfix: Detect genbuild.sh in repo correctly (Luke Dashjr)
e98e3dd Bugfix: Only use git for build info if the repository is actually the right one (Luke Dashjr)

Tree-SHA512: 510d7ec8cfeff4e8e0c7ac53631eb32c7acaada7017e7f8cc2e6f60d86afe1cd131870582e01022f961c85a783a130bcb8fef971f8b110070c9c02afda020726
pull/1/head
Wladimir J. van der Laan 5 years ago
parent
commit
d25449f858
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 1
      contrib/gitian-descriptors/gitian-linux.yml
  2. 1
      contrib/gitian-descriptors/gitian-osx.yml
  3. 1
      contrib/gitian-descriptors/gitian-win.yml
  4. 6
      share/genbuild.sh

1
contrib/gitian-descriptors/gitian-linux.yml

@ -132,6 +132,7 @@ script: | @@ -132,6 +132,7 @@ script: |
export PATH=${WRAP_DIR}:${PATH}
# Create the release tarball using (arbitrarily) the first host
export GIT_DIR="$PWD/.git"
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist

1
contrib/gitian-descriptors/gitian-osx.yml

@ -101,6 +101,7 @@ script: | @@ -101,6 +101,7 @@ script: |
export PATH=${WRAP_DIR}:${PATH}
# Create the release tarball using (arbitrarily) the first host
export GIT_DIR="$PWD/.git"
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist

1
contrib/gitian-descriptors/gitian-win.yml

@ -116,6 +116,7 @@ script: | @@ -116,6 +116,7 @@ script: |
export PATH=${WRAP_DIR}:${PATH}
# Create the release tarball using (arbitrarily) the first host
export GIT_DIR="$PWD/.git"
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist

6
share/genbuild.sh

@ -17,9 +17,13 @@ else @@ -17,9 +17,13 @@ else
exit 1
fi
git_check_in_repo() {
! { git status --porcelain -uall --ignored "$@" 2>/dev/null || echo '??'; } | grep -q '?'
}
DESC=""
SUFFIX=""
if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then
# clean 'dirty' status of touched files that haven't been modified
git diff >/dev/null 2>/dev/null

Loading…
Cancel
Save