Re: [PATCH] fixup??? Merge branch 'ab/ci-updates' into seen

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 2023 bytes --]

Hi Ævar,

On Tue, 23 Nov 2021, Ævar Arnfjörð Bjarmason wrote:

> On Mon, Nov 22 2021, Johannes Schindelin wrote:
>
> > On Mon, 22 Nov 2021, Ævar Arnfjörð Bjarmason wrote:
> >
> >> On Mon, Nov 22 2021, Johannes Schindelin via GitGitGadget wrote:
> >>
> >> > diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
> >> > index c0bae709b3b..c508c18ad44 100755
> >> > --- a/ci/run-build-and-tests.sh
> >> > +++ b/ci/run-build-and-tests.sh
> >> > @@ -45,9 +45,8 @@ linux-gcc-4.8)
> >> >  	export MAKE_TARGETS=all
> >> >  	;;
> >> >  esac
> >> > -make -C contrib/scalar test
> >> > -
> >> >  make $MAKE_TARGETS
> >> > +make -C contrib/scalar test
> >> >
> >> >  check_unignored_build_artifacts
> >>
> >> The CI breakage was introduced with the merger with ab/ci-updates, but
> >> the combination of the two just reveals an existing breakage in
> >> js/scalar.
> >
> > Which shows that I was wrong to pander to your repeated demand to include
> > Scalar in the CI builds already at this early stage.
>
> Us finding an a bug in a topic that's happening outside of CI means we
> shouldn't have added it to CI in the first place? Isn't spotting these
> issues a good thing?

Let's analyze "these issues".

Before your patch series, Scalar's `make -C contrib/scalar test` came
after the `make test` which ensured that Git was built. As designed.

After merging your patch series, the `make test` was magically moved
_after_ `make -C contrib/scalar test` (which is wrong for more reasons
than just that Git was not built yet).

So the "issue" is a simple mis-merge, and I provided a fix.

Ciao,
Johannes

P.S.: Of course, this could have been easily avoided by holding off
patches that intentionally touch the very same code as other patch series
that are already in flight. This kind of conflict seems to happen more
often than usual as of late. It happened with the FSMonitor patches and
repo-settings, with the hooks patches, the pager patch yesterday, etc.