Skip to content

Commit f8a9a1a

Browse files
infra: hotfix java base builder (#11614)
Ref: #11613 For some reason this dependency in jazzer's WORKSPACE: ```sh http_archive( name = "com_grail_bazel_toolchain", sha256 = "da607faed78c4cb5a5637ef74a36fdd2286f85ca5192222c4664efec2d529bb8", strip_prefix = "bazel-toolchain-0.6.3", urls = ["https://github.com/grailbio/bazel-toolchain/archive/refs/tags/0.6.3.tar.gz"], ) ``` is no longer valid. The URL now downloads `toolchains_llvm-0.6.3` instead, and this looks to be because they renamed the repo https://github.com/grailbio/bazel-toolchain which now redirects to https://github.com/bazel-contrib/toolchains_llvm --------- Signed-off-by: David Korczynski <[email protected]>
1 parent 311ec79 commit f8a9a1a

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

infra/base-images/base-builder/install_java.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,19 @@ rm -rf $JAVA_HOME/jmods $JAVA_HOME/lib/src.zip
2929
cd $SRC/
3030
git clone https://github.com/CodeIntelligenceTesting/jazzer && \
3131
cd jazzer && \
32+
3233
git checkout b12d1ea863b336b120e192700ac11c9744af6cfd # v0.17.1
34+
#git checkout b12132743b2c0d0def680512c0c4bcb052e20b1b # v0.22.1
3335
cat << 'EOF' >> .bazelrc
3436
build --java_runtime_version=local_jdk_15
3537
build --cxxopt=-stdlib=libc++
3638
build --linkopt=-lc++
3739
EOF
40+
41+
# Hotfix: https://github.com/google/oss-fuzz/issues/11613
42+
sed -i 's/da607faed78c4cb5a5637ef74a36fdd2286f85ca5192222c4664efec2d529bb8/a0a45349bf5d57bbefe2669225cda802c5d9ab8ea412a5e683f52bdcf3f16c65/g' ./WORKSPACE.bazel
43+
sed -i 's/bazel-toolchain-0.6.3/toolchains_llvm-0.6.3/g' ./WORKSPACE.bazel
44+
3845
bazel build //src/main/java/com/code_intelligence/jazzer:jazzer_standalone_deploy.jar //deploy:jazzer-api //launcher:jazzer
3946
cp $(bazel cquery --output=files //src/main/java/com/code_intelligence/jazzer:jazzer_standalone_deploy.jar) /usr/local/bin/jazzer_agent_deploy.jar
4047
cp $(bazel cquery --output=files //launcher:jazzer) /usr/local/bin/jazzer_driver

0 commit comments

Comments
 (0)