Skip to content

Commit

Permalink
surrealdb: use default Rust toolchain and update build path (#12738)
Browse files Browse the repository at this point in the history
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 surrealdb/surrealdb#4561.
  • Loading branch information
gguillemas authored Nov 20, 2024
1 parent 9af0733 commit f37d013
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions projects/surrealdb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion projects/surrealdb/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f37d013

Please sign in to comment.