Fix build of several projects #11936
Conversation
|
guidovranken is either the primary contact or is in the CCs list of projects/nettle. |
|
Is it fine to merge this despite the failures? |
Yes this + #11943 should make the projects succeed. |
|
Can this be merged? Optionally retrigger CI; now that #11943 has been merged, it should succeed now |
|
You can also rebase or merge with current |
| @@ -13,7 +13,6 @@ architectures: | |||
| main_repo: 'https://git.lysator.liu.se/nettle/nettle' | |||
|
|
|||
| fuzzing_engines: | |||
| - afl | |||
There was a problem hiding this comment.
Is this needed? The nettle build is now passing, see https://oss-fuzz-build-logs.storage.googleapis.com/index.html#nettle , so afl should not be needed to be removed for that reason.
If you want to do it with the goal of un-pinning the project, I'd say it should be done in the same pull request. That is, also include the following diff:
diff --git a/projects/nettle/Dockerfile b/projects/nettle/Dockerfile
index f667134aa..ef95c688d 100644
--- a/projects/nettle/Dockerfile
+++ b/projects/nettle/Dockerfile
@@ -14,8 +14,7 @@
#
################################################################################
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! Project pinned after a clang update and an afl link error. Log: https://oss-fuzz-gcb-logs.storage.googleapis.com/log-e701b6fa-f3a0-414e-ad6e-0223e6d42ebd.txt
+FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y software-properties-common make autoconf build-essential wget lzip libtool python
RUN git clone --depth 1 https://git.lysator.liu.se/nettle/nettle
RUN git clone --depth 1 https://github.com/randombit/botan.git
|
Overridden by #11959 |
Spent a lot of time trying to fix build with new clang/AFL (#11714) but didn't succeed right now so disabling AFL for some projects.