Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

surrealdb: use nightly Rust #11777

Merged
merged 3 commits into from
Apr 5, 2024
Merged

surrealdb: use nightly Rust #11777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d48ae73
surrealdb: use nightly Rust
gguillemas Apr 3, 2024
0983353
Merge branch 'master' into nightly-rust
gguillemas Apr 4, 2024
7463e12
Allow fuzzing unstable features
gguillemas Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions projects/surrealdb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ 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(surrealdb/surrealdb#1873): Remove `RUN rustup.*` lines once
# rust-lang/rust#110475 is fixed.
RUN rustup install nightly-2023-04-21
RUN rustup default nightly-2023-04-21
# 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cd lib
cp fuzz/fuzz_targets/*.dict $OUT/ || true

# Add additional compiler flags required for a successful build.
export RUSTFLAGS="$RUSTFLAGS --cfg uuid_unstable"
export RUSTFLAGS="$RUSTFLAGS --cfg surrealdb_unstable"

cargo fuzz build -O --debug-assertions

Expand Down
Loading