]> git.ipfire.org Git - thirdparty/git.git/commitdiff
ci: fix p4d executable not being found on GitHub Actions
authorPatrick Steinhardt <ps@pks.im>
Tue, 22 Apr 2025 05:47:27 +0000 (07:47 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Apr 2025 14:49:16 +0000 (07:49 -0700)
Our tests for git-p4(1) depend on the p4d(1) and p4(1) executables to
exist. As we require specific versions of those binaries which typically
aren't available on common distributions, we install them manually via
"ci/install-dependencies.sh".

This script will put the binaries into "$CUSTOM_PATH", which gets
defined by "ci/lib.sh" -- if not explicitly overridden, its value will
be set to "$HOME/path". This causes issues though when running our tests
as unprivileged user, as we do both in GitLab CI and GitHub Actions,
because "$HOME" will be different when installing dependencies and when
running the tests. Consequently, the downloaded binaries will not be
found unless "$CUSTOM_PATH" is overridden to a common location.

We already do this for GitLab CI, where it points to "/custom". Let's do
the same for GitHub Actions so that Perforce-based tests are executed
again.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
.github/workflows/main.yml

index 9959b61ece2bcc63ce70fc7c0b6f2089adba661f..929de4a5aa09ca6ec5ea8cc195428f0f1e9e9483 100644 (file)
@@ -407,6 +407,7 @@ jobs:
       jobname: ${{matrix.vector.jobname}}
       CC: ${{matrix.vector.cc}}
       CI_JOB_IMAGE: ${{matrix.vector.image}}
+      CUSTOM_PATH: /custom
     runs-on: ubuntu-latest
     container: ${{matrix.vector.image}}
     steps: