From a339cd0ff160b50f19c705b5495c026a7030112d Mon Sep 17 00:00:00 2001 From: Catena cyber <35799796+catenacyber@users.noreply.github.com> Date: Thu, 25 Feb 2021 10:20:26 +0100 Subject: [PATCH] Fixes teleport and syzkaller builds (#5254) * Fixes teleport and syzkaller builds By running go mod vendor after go mod tidy * fixup syzkaller --- projects/syzkaller/build.sh | 3 +++ projects/teleport/Dockerfile | 3 ++- projects/teleport/build.sh | 5 +---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/syzkaller/build.sh b/projects/syzkaller/build.sh index e47096bb8..0e98093f0 100755 --- a/projects/syzkaller/build.sh +++ b/projects/syzkaller/build.sh @@ -18,6 +18,9 @@ make descriptions + +go mod tidy && go mod vendor + compile_go_fuzzer github.com/google/syzkaller/pkg/compiler Fuzz compiler_fuzzer compile_go_fuzzer github.com/google/syzkaller/prog/test FuzzDeserialize prog_deserialize_fuzzer compile_go_fuzzer github.com/google/syzkaller/prog/test FuzzParseLog prog_parselog_fuzzer diff --git a/projects/teleport/Dockerfile b/projects/teleport/Dockerfile index bd0658129..8ffafb3a0 100644 --- a/projects/teleport/Dockerfile +++ b/projects/teleport/Dockerfile @@ -15,5 +15,6 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder +RUN git clone --depth 1 https://github.com/gravitational/teleport.git COPY build.sh $SRC/ -WORKDIR $SRC/ +WORKDIR $SRC/teleport diff --git a/projects/teleport/build.sh b/projects/teleport/build.sh index f5d464e85..260d47952 100644 --- a/projects/teleport/build.sh +++ b/projects/teleport/build.sh @@ -15,10 +15,7 @@ # ################################################################################ - -mkdir -p $GOPATH/src/github.com/gravitational -cd $GOPATH/src/github.com/gravitational -git clone https://github.com/gravitational/teleport.git +make update-vendor compile_go_fuzzer github.com/gravitational/teleport/lib/fuzz FuzzParseProxyJump utils_fuzz gofuzz compile_go_fuzzer github.com/gravitational/teleport/lib/fuzz FuzzNewExpression parse_fuzz gofuzz