diff options
| author | Todd Zullinger <tmz@pobox.com> | 2017-11-28 09:37:18 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-29 08:47:42 +0900 |
| commit | ae373879a4da65cfb40bff2afc685fd33e31a65d (patch) | |
| tree | 7077fddba96b37aae0925b5eced3a0f03969029e | |
| parent | 01c54284f1f4ba6df82b42bcf6b24b96a458bb44 (diff) | |
| download | git-cc/require-tcl-tk-for-build.tar.gz | |
travis-ci: avoid new tcl/tk build requirementcc/require-tcl-tk-for-build
A build requirement on tcl/tk was added in 01c54284f1 (Makefile: check
that tcl/tk is installed, 2017-11-20). For building and running the
tests, we don't need tcl/tk installed. Bypass the requirement.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | ci/run-linux32-docker.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 281f101f31..9e57caa83d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ addons: env: global: + - BYPASS_TCLTK_CHECK=1 - DEVELOPER=1 # The Linux build installs the defined dependency versions below. # The OS X build installs the latest available versions. Keep that diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh index 0edf63acfa..8c2b32f7b3 100755 --- a/ci/run-linux32-docker.sh +++ b/ci/run-linux32-docker.sh @@ -13,6 +13,7 @@ docker pull daald/ubuntu32:xenial docker run \ --interactive \ + --env BYPASS_TCLTK_CHECK \ --env DEVELOPER \ --env DEFAULT_TEST_TARGET \ --env GIT_PROVE_OPTS \ |