{"thread":{"id":"61439","subject":"[PATCH] gitlab-ci: fix installing dependencies for fuzz smoke tests","startedAt":"2024-05-09T08:25:34Z","lastAt":"2024-05-09T15:47:04Z","messageCount":2,"participants":["Patrick Steinhardt","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"494344","messageId":"5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im","threadId":"61439","inReplyTo":null,"subject":"[PATCH] gitlab-ci: fix installing dependencies for fuzz smoke tests","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2024-05-09T08:25:27Z","receivedAt":"2024-05-09T08:25:34Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"There was a semantic merge conflict between 9cdeb34b96 (ci: merge\nscripts which install dependencies, 2024-04-12), which has merged\n\"ci/install-docker-dependencies.sh\" into \"ci/install-dependencies.sh\"\nand c7b228e000 (gitlab-ci: add smoke test for fuzzers, 2024-04-29),\nwhich has added a new fuzz smoke test job that makes use of the\nnow-removed script.\n\nAdapt the job to instead use the new script to install dependencies.\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n\nThis patch is based on 0f3415f1f8 (The second batch, 2024-05-08), which\ncontains the refactorings that merged the two dependency installation\nscripts into one. Other than that, I have pulled in two dependencies:\n\n  - ps/enable-minimal-fuzzers-at-gitlab, which is the topic I'm fixing.\n\n  - ps/ci-python-2-deprecation, which is required to make jobs based on\n    \"ubuntu:latest\" pass in the first place. Other than that there is no\n    textual dependency on this topic, which means that there is no need\n    to pull this in as an actual dependency.\n\nWith this, all jobs pass again. See [1] for an example run.\n\nPatrick\n\n[1]: https://gitlab.com/gitlab-org/git/-/merge_requests/147\n\n .gitlab-ci.yml | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/.gitlab-ci.yml b/.gitlab-ci.yml\nindex 3836351d07..dfc3c88bec 100644\n--- a/.gitlab-ci.yml\n+++ b/.gitlab-ci.yml\n@@ -100,7 +100,7 @@ test:fuzz-smoke-tests:\n   variables:\n     CC: clang\n   before_script:\n-    - ./ci/install-docker-dependencies.sh\n+    - ./ci/install-dependencies.sh\n   script:\n     - ./ci/run-build-and-minimal-fuzzers.sh\n \n\nbase-commit: 33a6a5abc0e6c276c9a07468bd3500245c97ad72\n-- \n2.44.0\n\n"},{"id":"494352","messageId":"xmqq8r0jvvgv.fsf@gitster.g","threadId":"61439","inReplyTo":"5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im","subject":"Re: [PATCH] gitlab-ci: fix installing dependencies for fuzz smoke tests","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-05-09T15:46:56Z","receivedAt":"2024-05-09T15:47:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Patrick Steinhardt <ps@pks.im> writes:\n\n> There was a semantic merge conflict between 9cdeb34b96 (ci: merge\n> scripts which install dependencies, 2024-04-12), which has merged\n> \"ci/install-docker-dependencies.sh\" into \"ci/install-dependencies.sh\"\n> and c7b228e000 (gitlab-ci: add smoke test for fuzzers, 2024-04-29),\n> which has added a new fuzz smoke test job that makes use of the\n> now-removed script.\n\nAh, I should have been more carefully paying attention to what\nhappens in ci/ directory (which I have largely been ignoring).\n\nThanks for fixing it up.\n"}]}