Skip to content

Commit 42cf4ac

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 683c54c commit 42cf4ac

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ jobs:
407407
jobname: ${{matrix.vector.jobname}}
408408
CC: ${{matrix.vector.cc}}
409409
CI_JOB_IMAGE: ${{matrix.vector.image}}
410+
CUSTOM_PATH: /custom
410411
runs-on: ubuntu-latest
411412
container: ${{matrix.vector.image}}
412413
steps:

0 commit comments

Comments
 (0)