From f37d01337ebfba9b7799d88ef894061885370694 Mon Sep 17 00:00:00 2001 From: Gerard Guillemas Martos Date: Wed, 20 Nov 2024 13:14:20 +0100 Subject: [PATCH] surrealdb: use default Rust toolchain and update build path (#12738) Since the merge of #12075 reverting #11681, these lines are no longer needed and may in fact be breaking the build. The `lib` directory referenced for building the fuzzers was also renamed to `sdk` in https://github.com/surrealdb/surrealdb/pull/4561. --- projects/surrealdb/Dockerfile | 4 ---- projects/surrealdb/build.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/projects/surrealdb/Dockerfile b/projects/surrealdb/Dockerfile index 2df8e825bb5d..f9952291b118 100644 --- a/projects/surrealdb/Dockerfile +++ b/projects/surrealdb/Dockerfile @@ -18,10 +18,6 @@ FROM gcr.io/oss-fuzz-base/base-builder-rust RUN git clone --depth 1 https://github.com/surrealdb/surrealdb surrealdb RUN git clone --depth 1 https://github.com/surrealdb/docs.surrealdb.com.git surrealdb_website WORKDIR surrealdb -# TODO(gguillemas): Remove `RUN rustup.*` lines once -# google/oss-fuzz#11681 is reverted to use nightly in image builder. -RUN rustup install nightly -RUN rustup default nightly # needed for MSAN and coverage build RUN rustup component add rust-src COPY build.sh $SRC/ diff --git a/projects/surrealdb/build.sh b/projects/surrealdb/build.sh index c5c02070fc0c..7a3b71e5c134 100755 --- a/projects/surrealdb/build.sh +++ b/projects/surrealdb/build.sh @@ -14,7 +14,7 @@ # limitations under the License. # ################################################################################ -cd lib +cd sdk # Copy dictionaries, but don't fail if there aren't any. cp fuzz/fuzz_targets/*.dict $OUT/ || true