From: Todd Zullinger <tmz@pobox.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Christian Couder <christian.couder@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>, git <git@vger.kernel.org>,
Dominik Mahrer <teddy@teddy.ch>,
git-packagers@googlegroups.com,
Christian Couder <chriscool@tuxfamily.org>,
Jeff King <peff@peff.net>
Subject: [PATCH] travis-ci: avoid new tcl/tk build requirement
Date: Tue, 28 Nov 2017 09:37:18 -0500 [thread overview]
Message-ID: <20171128143718.3748-1-tmz@pobox.com> (raw)
In-Reply-To: <xmqqlgir6mwk.fsf@gitster.mtv.corp.google.com>
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>
---
Junio C Hamano wrote:
> It seems that TravisCI objects ;-)
>
> https://travis-ci.org/git/git/jobs/307745929
Interesting that the main builds passed. I don't know what the default
64-bit linuxinstall looks like in travis, so I presume it includes
tcl/tk or something.
In any case, perhaps something like this is what we want? We could use
NO_TCLTK or ensure that tcl/tk is installed in all environments. I used
the BYPASS_TCLTK_CHECK option since the tests have been running without
tcl/tk previously. If they become required for the tests, this can be
adjusted.
I have a travis job running with this change here:
https://travis-ci.org/tmzullinger/git/builds/308452464
So far the only failure is (what looks like) an unrelated one in the
GETTEXT_POISON build.
.travis.yml | 1 +
ci/run-linux32-docker.sh | 1 +
2 files changed, 2 insertions(+)
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 \
--
2.15.0
next prev parent reply other threads:[~2017-11-28 14:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 17:15 [PATCH] Makefile: check that tcl/tk is installed Christian Couder
2017-11-20 17:17 ` Christian Couder
2017-11-20 19:19 ` Jonathan Nieder
2017-11-20 23:58 ` Christian Couder
2017-11-26 19:15 ` Jeff King
2017-11-26 20:57 ` Christian Couder
2017-11-27 15:31 ` Jeff King
2017-11-27 1:13 ` Junio C Hamano
2017-11-27 4:31 ` Junio C Hamano
2017-11-27 4:35 ` Jeff King
2017-11-27 5:22 ` Todd Zullinger
2017-11-27 8:24 ` Christian Couder
2017-11-27 15:27 ` Jeff King
2017-11-27 23:42 ` Junio C Hamano
2017-11-28 4:35 ` Junio C Hamano
2017-11-28 14:37 ` Todd Zullinger [this message]
2017-11-28 15:03 ` [PATCH] travis-ci: avoid new tcl/tk build requirement Christian Couder
2017-11-28 16:02 ` Todd Zullinger
2017-11-28 23:47 ` Junio C Hamano
2017-11-27 9:08 ` [PATCH] Makefile: check that tcl/tk is installed Junio C Hamano
2017-11-25 20:46 ` Christian Couder
2017-11-26 3:53 ` Junio C Hamano
2017-11-26 14:00 ` Christian Couder
2017-11-26 17:43 ` Ramsay Jones
2017-11-26 18:34 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171128143718.3748-1-tmz@pobox.com \
--to=tmz@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git-packagers@googlegroups.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=teddy@teddy.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).