git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/1] fixup! Merge branch 'js/vsts-ci' into pu

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Jan 29, 2019, 10:56 UTC
Message-ID
<946d5637f10d25ca7addbe376ead053be569c5e8.1548759361.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.113.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

The js/vsts-ci and sg/travis-specific-cc branches do not interact so well... While Travis has the Homebrew package gcc@8 installed in their Xcode 10.1 images, Azure Pipelines' agents do not.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 ci/lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/lib.sh b/ci/lib.sh
index 276b99693d..16f4ecbc67 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -123,7 +123,7 @@ then
 		echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
 	}
 
-	BREW_INSTALL_PACKAGES=
+	BREW_INSTALL_PACKAGES=gcc@8
 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
 	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
 	export MAKEFLAGS="--jobs=10"
-- 
gitgitgadget
Previous: Johannes Schindelin via GitGitGadgetNext: Junio C Hamano
Message 2 of 3 in “Provide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc'”
  1. 0/1 Provide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc'Johannes Schindelin via GitGitGadget, Jan 29, 2019
  2. 1/1 fixup! Merge branch 'js/vsts-ci' into puJohannes Schindelin via GitGitGadget, Jan 29, 2019
  3. Junio C HamanoJan 29, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.