aboutsummaryrefslogtreecommitdiff
path: root/contrib/gitian-descriptors
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/gitian-descriptors')
-rwxr-xr-xcontrib/gitian-descriptors/assign_DISTNAME12
-rw-r--r--contrib/gitian-descriptors/gitian-linux.yml12
-rw-r--r--contrib/gitian-descriptors/gitian-osx.yml12
-rw-r--r--contrib/gitian-descriptors/gitian-win.yml12
-rwxr-xr-xcontrib/gitian-descriptors/make_git_archive20
5 files changed, 39 insertions, 29 deletions
diff --git a/contrib/gitian-descriptors/assign_DISTNAME b/contrib/gitian-descriptors/assign_DISTNAME
new file mode 100755
index 0000000000..a1ab3f7cbd
--- /dev/null
+++ b/contrib/gitian-descriptors/assign_DISTNAME
@@ -0,0 +1,12 @@
+# Copyright (c) 2020 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# A helper script to be sourced into the gitian descriptors
+
+if RECENT_TAG="$(git describe --exact-match HEAD)"; then
+ VERSION="${RECENT_TAG#v}"
+else
+ VERSION="$(git rev-parse --short HEAD)"
+fi
+DISTNAME="bitcoin-${VERSION}"
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index f421372e10..0ed1e16f7e 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -140,9 +140,15 @@ script: |
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
export PATH=${WRAP_DIR}:${PATH}
- # Create the git archive, and define DISTNAME and GIT_ARCHIVE variables.
- # shellcheck source=contrib/gitian-descriptors/make_git_archive
- source contrib/gitian-descriptors/make_git_archive
+ # Define DISTNAME variable.
+ # shellcheck source=contrib/gitian-descriptors/assign_DISTNAME
+ source contrib/gitian-descriptors/assign_DISTNAME
+
+ GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
+
+ # Create the source tarball
+ mkdir -p "$(dirname "$GIT_ARCHIVE")"
+ git archive --output="$GIT_ARCHIVE" HEAD
ORIGPATH="$PATH"
# Extract the git archive into a dir for each host and build
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 82f8f194fc..bbae7201e5 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -103,9 +103,15 @@ script: |
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
export PATH=${WRAP_DIR}:${PATH}
- # Create the git archive, and define DISTNAME and GIT_ARCHIVE variables.
- # shellcheck source=contrib/gitian-descriptors/make_git_archive
- source contrib/gitian-descriptors/make_git_archive
+ # Define DISTNAME variable.
+ # shellcheck source=contrib/gitian-descriptors/assign_DISTNAME
+ source contrib/gitian-descriptors/assign_DISTNAME
+
+ GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
+
+ # Create the source tarball
+ mkdir -p "$(dirname "$GIT_ARCHIVE")"
+ git archive --output="$GIT_ARCHIVE" HEAD
ORIGPATH="$PATH"
# Extract the git archive into a dir for each host and build
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 54ad68a2a3..adad7c32d1 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -108,9 +108,15 @@ script: |
create_per-host_compiler_wrapper "${REFERENCE_DATETIME}"
export PATH=${WRAP_DIR}:${PATH}
- # Create the git archive, and define DISTNAME and GIT_ARCHIVE variables.
- # shellcheck source=contrib/gitian-descriptors/make_git_archive
- source contrib/gitian-descriptors/make_git_archive
+ # Define DISTNAME variable.
+ # shellcheck source=contrib/gitian-descriptors/assign_DISTNAME
+ source contrib/gitian-descriptors/assign_DISTNAME
+
+ GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
+
+ # Create the source tarball
+ mkdir -p "$(dirname "$GIT_ARCHIVE")"
+ git archive --output="$GIT_ARCHIVE" HEAD
ORIGPATH="$PATH"
# Extract the git archive into a dir for each host and build
diff --git a/contrib/gitian-descriptors/make_git_archive b/contrib/gitian-descriptors/make_git_archive
deleted file mode 100755
index d922c94c60..0000000000
--- a/contrib/gitian-descriptors/make_git_archive
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2020 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
-# A helper script to be sourced into the gitian descriptors
-
-mkdir -p ${OUTDIR}/src
-RECENT_TAG=$(git describe --abbrev=0 HEAD)
-if [ $RECENT_TAG = $(git describe HEAD) ]; then
- if [[ $RECENT_TAG == v* ]]; then
- VERSION=${RECENT_TAG:1}
- else
- VERSION=$RECENT_TAG
- fi
-else
- VERSION=$(git rev-parse --short HEAD)
-fi
-DISTNAME=bitcoin-${VERSION}
-GIT_ARCHIVE="${OUTDIR}/src/${DISTNAME}.tar.gz"
-git archive --output=$GIT_ARCHIVE HEAD