| Message ID | 5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 672cf2c8701de3b0d8ab740768709f0b34b2a7aa |
| Headers | show |
| Series | gitlab-ci: fix installing dependencies for fuzz smoke tests | expand |
Patrick Steinhardt <ps@pks.im> writes: > There was a semantic merge conflict between 9cdeb34b96 (ci: merge > scripts which install dependencies, 2024-04-12), which has merged > "ci/install-docker-dependencies.sh" into "ci/install-dependencies.sh" > and c7b228e000 (gitlab-ci: add smoke test for fuzzers, 2024-04-29), > which has added a new fuzz smoke test job that makes use of the > now-removed script. Ah, I should have been more carefully paying attention to what happens in ci/ directory (which I have largely been ignoring). Thanks for fixing it up.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3836351d07..dfc3c88bec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,7 @@ test:fuzz-smoke-tests: variables: CC: clang before_script: - - ./ci/install-docker-dependencies.sh + - ./ci/install-dependencies.sh script: - ./ci/run-build-and-minimal-fuzzers.sh
There was a semantic merge conflict between 9cdeb34b96 (ci: merge scripts which install dependencies, 2024-04-12), which has merged "ci/install-docker-dependencies.sh" into "ci/install-dependencies.sh" and c7b228e000 (gitlab-ci: add smoke test for fuzzers, 2024-04-29), which has added a new fuzz smoke test job that makes use of the now-removed script. Adapt the job to instead use the new script to install dependencies. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- This patch is based on 0f3415f1f8 (The second batch, 2024-05-08), which contains the refactorings that merged the two dependency installation scripts into one. Other than that, I have pulled in two dependencies: - ps/enable-minimal-fuzzers-at-gitlab, which is the topic I'm fixing. - ps/ci-python-2-deprecation, which is required to make jobs based on "ubuntu:latest" pass in the first place. Other than that there is no textual dependency on this topic, which means that there is no need to pull this in as an actual dependency. With this, all jobs pass again. See [1] for an example run. Patrick [1]: https://gitlab.com/gitlab-org/git/-/merge_requests/147 .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 33a6a5abc0e6c276c9a07468bd3500245c97ad72