maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gitian: Limit sourced script to just assignments

Browse source 
Previously, the sourced script would create the source tarball. Now, it
only assigns variables and the source-ing script has more flexibility in
determining what to do with these variables.

See later commit showing how this flexibility is useful in our Guix
builds.
This commit is contained in:
Carl Dong 2020-04-22 13:00:42 -04:00
parent 6e3fc7492a
commit 395c1137f6
No known key found for this signature in database
GPG key ID: 0CC52153197991A5
5 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/gitian-descriptors/assign_DISTNAME Executable file
View file

@ -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}"

12
contrib/gitian-descriptors/gitian-linux.yml
View file

@ -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

12
contrib/gitian-descriptors/gitian-osx.yml
View file

@ -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

12
contrib/gitian-descriptors/gitian-win.yml
View file

@ -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

20
contrib/gitian-descriptors/make_git_archive
View file

@ -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