threads / patch / 50348

patchProvide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc'

Subject: [PATCH 0/1] Provide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc'

## tl;dr

3 messages between Jan 29, 2019 and Jan 29, 2019. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Johannes Schindelin via GitGitGadget· Jan 29, 2019, 10:56 UTC · lore

There are merge conflicts that do not result in merge conflict markers: e.g. when one branch extends a function's signature, and another branch adds a caller.

In this instance, sg/travis-specific-cc wants to use gcc-8 in the osx-gcc job (which is already installed, but not linked, on Travis' macOS agents), and js/vsts-ci wants to run the tests on Azure Pipelines (where gcc-8 is not installed by default).

So this fixup is necessary to fix that conflict.

To see that this is necessary, I kicked off a public build and you can see the symptom of the problem here [https://dev.azure.com/git/git/_build/results?buildId=318&view=logs&jobId=51041795-01c5-57f3-5561-107b6b9e51a6&taskId=fadc714a-a906-5cf2-cc7a-335e443ad2f8&lineStart=326&lineEnd=327&colStart=1&colEnd=71] .

Johannes Schindelin (1):
  fixup! Merge branch 'js/vsts-ci' into pu

 ci/lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

base-commit: c7baf85843ec1dc8272483baa2f84d0ec66ad882
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-113%2Fdscho%2Fosx-gcc%408-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-113/dscho/osx-gcc@8-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/113

-- 
gitgitgadget

Johannes Schindelin via GitGitGadget· Jan 29, 2019, 10:56 UTC · re: Johannes Schindelin via GitGitGadget · lore

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

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(-)

Show changes to ci/lib.sh +1 −1

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

Junio C Hamano· Jan 29, 2019, 17:50 UTC · re: Johannes Schindelin via GitGitGadget · lore

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

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 10 quoted lines

> 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(-)

Thanks; will use as a merge-fix/ recipe (assuming that sg/travis would graduate before vsts-ci).

Show 13 quoted lines

> 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"