aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2025-04-22 07:47:27 +0200
committerJunio C Hamano <gitster@pobox.com>2025-04-22 07:49:16 -0700
commit42cf4ac552dc65579c6fe3b7f9e440aa89da68b7 (patch)
tree6e2825d40506010fe78bde7d0f652af5a5d5f27a
parent683c54c999c301c2cd6f715c411407c413b1d84e (diff)
downloadgit-42cf4ac552dc65579c6fe3b7f9e440aa89da68b7.tar.gz
ci: fix p4d executable not being found on GitHub Actions
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>
-rw-r--r--.github/workflows/main.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9959b61ece..929de4a5aa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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: