From f1c00f66751bf55a1dbabe89832cabd04b2dd75b Mon Sep 17 00:00:00 2001 From: AdamKorcz <44787359+AdamKorcz@users.noreply.github.com> Date: Mon, 6 Jan 2025 14:49:10 +0000 Subject: [PATCH] golang: fix broken build (#12908) Needed to bump golang version. Signed-off-by: Adam Korczynski --- projects/golang/Dockerfile | 5 +++++ projects/golang/build.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/golang/Dockerfile b/projects/golang/Dockerfile index 5769bfd7b..7a8dcfb92 100644 --- a/projects/golang/Dockerfile +++ b/projects/golang/Dockerfile @@ -23,6 +23,11 @@ RUN git clone --depth 1 https://github.com/golang/image RUN git clone --depth 1 https://github.com/golang/crypto RUN git clone --depth 1 https://github.com/golang/text RUN git clone --depth 1 https://github.com/AdamKorcz/instrumentation +RUN wget https://go.dev/dl/go1.23.4.linux-amd64.tar.gz \ + && mkdir temp-go \ + && rm -rf /root/.go/* \ + && tar -C temp-go/ -xzf go1.23.4.linux-amd64.tar.gz \ + && mv temp-go/go/* /root/.go/ COPY build.sh text_fuzzer.go \ math_big_fuzzer.go \ fuzz_tar_reader.go \ diff --git a/projects/golang/build.sh b/projects/golang/build.sh index 6cc29b2a2..0fe3d2daf 100755 --- a/projects/golang/build.sh +++ b/projects/golang/build.sh @@ -134,7 +134,7 @@ compile_go_fuzzer regexpPackage FuzzFindMatchApis fuzz_find_match_apis cp $SRC/h2c_fuzzer.go $SRC/net/http2/h2c/ cd $SRC/net/http2/h2c cd $SRC/instrumentation && go run main.go --target_dir=$SRC/net --check_io_length=true && cd - -go mod tidy -e -go=1.16 && go mod tidy -e -go=1.17 +go mod tidy compile_go_fuzzer . FuzzH2c fuzz_x_h2c mv $SRC/fuzz_x_h2c.options $OUT/