| Message ID | 946d5637f10d25ca7addbe376ead053be569c5e8.1548759361.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Provide a fix for the semantic merge conflict between 'js/vsts-ci' and 'sg/travis-specific-cc' | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes: > 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). > 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"
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"