On Sat, Apr 23, 2022 at 10:12 AM Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx> writes:
>
> > Not sure why this is suddenly failing, but this proposed fixup also
> > makes both server names consistent and would be easier to clean up
> > later.
I think my merge resolution was wrong and so it might not be as
obvious as I thought.
> Yeah, I was wondering why the other one uses a fully hardcoded URL
> that these variables do not know about.
>
> Would it make sense to rename LINUX_P4_VERSION to P4_AT_PERFORCE_VERSION
> or something and set it also in the macOS section in ci/lib.sh?
Will do (if I can just find which of the sometimes conflicting changes
in the later branches would be the best target),
but I was preparing a fixup or commit to a different series instead of
one for this one.
> We have
>
> # The Linux build installs the defined dependency versions below.
> # The OS X build installs much more recent versions, whichever
> # were recorded in the Homebrew database upon creating the OS X
> # image.
> # Keep that in mind when you encounter a broken OS X build!
> export LINUX_P4_VERSION="16.2"
>
> which if I am reading your series correctly has become stale; we no
> longer rely on brew/cask, and do this for macOS identically to what
> we do here for Linux.
correct; this comment is the one I punted fixing to avoid conflicts
and that I refer to in my commit.
I suspect that some of the moving around that was done in later code
could be avoided now that both jobs use wget to get perforce, but
regardless moving that comment into the linux branch wasn't correct
(we can't assume then what the other branch does) so at minimum it
should look like :
# The Linux build installs the defined dependency versions below.
# The OS X build installs much more recent versions
# Keep that in mind when you encounter a broken OS X build!
Carlo
