Skip to content

Commit

Permalink
Merge bitcoin#18945: build: Ensure source tarball has leading directo…
Browse files Browse the repository at this point in the history
…ry name (0.20)

59d57f6 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 bitcoin#18818.: ensure that the source tarball has leading directory name.

ACKs for top commit:
  Sjors:
    tACK 59d57f6
  hebasto:
    ACK 59d57f6.

Tree-SHA512: 6562f4cd631d2ca3c331a05d028a3c46289a7e146319b8718f96b766f952e3b831d05e249ebcc1b27f5b91a6f318a5fdd86d07b2a80ce792d4b1b032e982ed6a
  • Loading branch information
laanwj committed May 12, 2020
2 parents fb5b098 + 59d57f6 commit 5747c4c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Expand Up @@ -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
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
Expand Up @@ -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
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win.yml
Expand Up @@ -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
Expand Down

0 comments on commit 5747c4c

Please sign in to comment.