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

Re: [PATCH v2 2/3] ci: upgrade version of p4 to 21.2

From
Jiang Xin <worldhello.net@gmail.com>
Date
Nov 24, 2022, 12:56 UTC
Message-ID
<CANYiYbGMdECEWzCOgBrU3su4m=hrp8MND17cZ8ZaNjpgUbXmuw@mail.gmail.com>
In-Reply-To
<221124.86ilj4pqfn.gmgdl@evledraar.gmail.com>

On Thu, Nov 24, 2022 at 7:01 PM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 8 quoted lines
>
> Omitted from this context is:
>
>         # The Linux build installs the defined dependency versions below.
>         # The OS X build installs much more recent versions,
>
> That part should be updated here, as it's now out-of-date, they're now
> installing the same version: 21.2.

Yes, the versions of p4 for linux and macos happen to be the same. We can use one variable to define p4 version for both linux and macos.

Show 22 quoted lines
>
> >       # 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"
> > +     export LINUX_P4_VERSION="21.2"
> >       export LINUX_GIT_LFS_VERSION="1.5.2"
> >
> >       P4_PATH="$HOME/custom/p4"
>
> This is a welcome change, but it would be even more welcome if you
> followed-up and unified the linux and osx p4 logic as a follow-up.
> I.e. after this we'll install 21.2 on both osx and linux, so the
> versions are no longer different.
>
> I think we probably won't need to install different versions for the two
> ever, we just drifted on the linux version, or maybe (per the comment
> we'll need to adjust) there was some problem before with upgrading the
> linux version, but no longer?
>
> I didn't dig, but covering some of that in the commit message would be
> most welcome.

It is commit d1c9195116 (ci: avoid brew for installing perforce, 2022-05-12), which changed the installation method of p4 on macOS. There is also a note about the obsolete comment in ci/lib.sh in this commit.

Show 8 quoted lines
> So can we just s/LINUX_P4_VERSION/P4_VERSION/ or something, and then
> change this in the "macos-latest";
>
>         wget -q "https://cdist2.perforce.com/perforce/r21.2/bin.macosx1015x86_64/helix-core-server.tgz"
>
> To:
>
>         wget -q "https://cdist2.perforce.com/perforce/r${P4_VERSION}/bin.macosx1015x86_64/helix-core-server.tgz"
> While doing that we can just move the "LINUX_P4_VERSION" (or whatever we
> rename it to) from lib.sh to "install-dependencies.sh".
>
Will do.

-- Jiang Xin

Previous: Ævar Arnfjörð BjarmasonNext: Jiang Xin
Message 43 of 47 in “Use fixed github-actions runner image”
  1. 0/2 Use fixed github-actions runner imageJiang Xin, Nov 23, 2022
  2. 1/2 github-actions: run gcc-8 on ubuntu-20.04 imageJiang Xin, Nov 23, 2022
  3. Johannes SchindelinNov 24, 2022
  4. 2/2 ci: upgrade version of p4Jiang Xin, Nov 23, 2022
  5. Johannes SchindelinNov 24, 2022
  6. Johannes SchindelinNov 24, 2022
  7. Johannes SchindelinNov 24, 2022
  8. Jiang XinNov 24, 2022
  9. Johannes SchindelinNov 24, 2022
  10. Jiang XinNov 24, 2022
  11. Johannes SchindelinNov 24, 2022
  12. 0/3 Fix broken CI on newer github-actions runner imageJiang Xin, Nov 24, 2022
  13. Johannes SchindelinNov 24, 2022
  14. Johannes SchindelinNov 24, 2022
  15. Jiang XinNov 24, 2022
  16. python 2 EOL (was: [PATCH v2 0/3] Fix broken CI on newer github-actions runner image)Ævar Arnfjörð Bjarmason, Nov 24, 2022
  17. Junio C HamanoNov 25, 2022
  18. 0/4 Fix broken CI on newer github-actions runner imageJiang Xin, Nov 24, 2022
  19. 0/4 Fix broken CI on newer github-actions runner imageJiang Xin, Nov 25, 2022
  20. 2/4 ci: remove the pipe after "p4 -V" to cache errorsJiang Xin, Nov 25, 2022
  21. Junio C HamanoNov 27, 2022
  22. Jiang XinNov 27, 2022
  23. 1/4 github-actions: run gcc-8 on ubuntu-20.04 imageJiang Xin, Nov 25, 2022
  24. Junio C HamanoNov 27, 2022
  25. 3/4 ci: p4 on Linux has the same version as on macOSJiang Xin, Nov 25, 2022
  26. Junio C HamanoNov 27, 2022
  27. 4/4 ci: install python on ubuntuJiang Xin, Nov 25, 2022
  28. Junio C HamanoNov 27, 2022
  29. Jiang XinNov 27, 2022
  30. Junio C HamanoNov 27, 2022
  31. 1/4 github-actions: run gcc-8 on ubuntu-20.04 imageJiang Xin, Nov 24, 2022
  32. Ævar Arnfjörð BjarmasonNov 24, 2022
  33. 2/4 ci: show error message of "p4 -V"Jiang Xin, Nov 24, 2022
  34. Ævar Arnfjörð BjarmasonNov 24, 2022
  35. Junio C HamanoNov 25, 2022
  36. 3/4 ci: p4 on Linux has the same version as on macOSJiang Xin, Nov 24, 2022
  37. 4/4 ci: install python on ubuntuJiang Xin, Nov 24, 2022
  38. 1/3 github-actions: run gcc-8 on ubuntu-20.04 imageJiang Xin, Nov 24, 2022
  39. Ævar Arnfjörð BjarmasonNov 24, 2022
  40. Junio C HamanoNov 25, 2022
  41. 2/3 ci: upgrade version of p4 to 21.2Jiang Xin, Nov 24, 2022
  42. Ævar Arnfjörð BjarmasonNov 24, 2022
  43. Jiang XinNov 24, 2022
  44. 3/3 ci: install python on ubuntuJiang Xin, Nov 24, 2022
  45. Ævar Arnfjörð BjarmasonNov 24, 2022
  46. Jiang XinNov 24, 2022
  47. Ævar Arnfjörð BjarmasonNov 24, 2022

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.