diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-05-12 16:17:50 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-05-12 16:18:44 +0200 |
| commit | 5747c4ca1bf8eafd52bfa82db3e3887dc133cb24 (patch) | |
| tree | c6098d688cbe3a0fff5bf03f85eff13709fe78af | |
| parent | fb5b0985987bcead8a3d69979663c19325236440 (diff) | |
| parent | 59d57f6c103100b3fdef59298d57ee8cf4c0b181 (diff) | |
| download | bitcoin-5747c4ca1bf8eafd52bfa82db3e3887dc133cb24.tar.xz | |
Merge #18945: build: Ensure source tarball has leading directory name (0.20)
59d57f6c103100b3fdef59298d57ee8cf4c0b181 build: Ensure source tarball has leading directory name (Luke Dashjr)
Pull request description:
In the interest of moving 0.20.0 forward and being able to do rc2, extract and backport the non-controversial part from #18818.: ensure that the source tarball has leading directory name.
ACKs for top commit:
Sjors:
tACK 59d57f6c103100b3fdef59298d57ee8cf4c0b181
hebasto:
ACK 59d57f6c103100b3fdef59298d57ee8cf4c0b181.
Tree-SHA512: 6562f4cd631d2ca3c331a05d028a3c46289a7e146319b8718f96b766f952e3b831d05e249ebcc1b27f5b91a6f318a5fdd86d07b2a80ce792d4b1b032e982ed6a
| -rw-r--r-- | contrib/gitian-descriptors/gitian-linux.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-osx.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index a13a42d391..6e55459f9c 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -191,4 +191,4 @@ script: | done mkdir -p ${OUTDIR}/src - git archive --output=${OUTDIR}/src/${DISTNAME}.tar.gz HEAD + git archive --prefix="${DISTNAME}/" --output=${OUTDIR}/src/${DISTNAME}.tar.gz HEAD diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 58531c81b4..61fc5d2e6a 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -161,6 +161,6 @@ script: | done mkdir -p ${OUTDIR}/src - git archive --output=${OUTDIR}/src/${DISTNAME}.tar.gz HEAD + git archive --prefix="${DISTNAME}/" --output=${OUTDIR}/src/${DISTNAME}.tar.gz HEAD mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index c5eea97c77..1f9ffd1389 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -157,7 +157,7 @@ script: | done mkdir -p ${OUTDIR}/src - git archive --output=${OUTDIR}/src/${DISTNAME}.tar.gz HEAD + git archive --prefix="${DISTNAME}/" --output=${OUTDIR}/src/${DISTNAME}.tar.gz HEAD cp -rf contrib/windeploy $BUILD_DIR cd $BUILD_DIR/windeploy |