diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2016-11-24 15:16:01 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-11-24 15:55:14 +0000 |
| commit | 52b03d1845714d2cdb7cd7e7697ff026c4d40c75 (patch) | |
| tree | ff4f17fd8600bcebce0ef2946a7ebc262a4a12ed /combine_distfiles.sh | |
| parent | cc428bc2193abfef4275954505a8dbf229ca8f4c (diff) | |
Make //tols/cpp/test start from the distribution artifact
The docker tests in //tools/cpp/test still assume that the sources
are enough to just compile.sh to bootstrap a bazel binary. Fix this,
by using the distribution archive instead.
While there, also add a target for the distribution archive as tar.
--
Change-Id: Ic31bb95da0165f83a14537a1719c27e5067d0d65
Reviewed-on: https://cr.bazel.build/7531
MOS_MIGRATED_REVID=140134322
Diffstat (limited to 'combine_distfiles.sh')
| -rwxr-xr-x | combine_distfiles.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/combine_distfiles.sh b/combine_distfiles.sh index 41f002f2d5..383739a3e1 100755 --- a/combine_distfiles.sh +++ b/combine_distfiles.sh @@ -40,4 +40,10 @@ do (cd "${PACKAGE_DIR}" && ${UNPACK} "${ARCHIVE}") done -(cd "${PACKAGE_DIR}" && find . -type f | sort | zip -qDX@ "${OUTPUT}") +if [ -n "${USE_TAR}" ] +then + (cd "${PACKAGE_DIR}" && tar -c -f "${OUTPUT}" --group=0 --owner=0 \ + $(find . -type f | sort)) +else + (cd "${PACKAGE_DIR}" && find . -type f | sort | zip -qDX@ "${OUTPUT}") +fi |