Skip to content

Commit

Permalink
gitian: Limit sourced script to just assignments
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dongcarl committed Apr 28, 2020
1 parent 6e3fc74 commit 395c113
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 29 deletions.
12 changes: 12 additions & 0 deletions 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}"
12 changes: 9 additions & 3 deletions contrib/gitian-descriptors/gitian-linux.yml
Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions contrib/gitian-descriptors/gitian-osx.yml
Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions contrib/gitian-descriptors/gitian-win.yml
Expand Up @@ -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
Expand Down
20 changes: 0 additions & 20 deletions contrib/gitian-descriptors/make_git_archive

This file was deleted.

0 comments on commit 395c113

Please sign in to comment.