From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Subject: [PATCH] gitlab-ci: fix installing dependencies for fuzz smoke tests
Date: Thu, 9 May 2024 10:25:27 +0200 [thread overview]
Message-ID: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im> (raw)
[-- Attachment #1: Type: text/plain, Size: 1694 bytes --]
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(-)
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
base-commit: 33a6a5abc0e6c276c9a07468bd3500245c97ad72
--
2.44.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next reply other threads:[~2024-05-09 8:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 8:25 Patrick Steinhardt [this message]
2024-05-09 15:46 ` [PATCH] gitlab-ci: fix installing dependencies for fuzz smoke tests Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).