From f60693f2e44163dc13e7cc249cf62feecdfafe5b Mon Sep 17 00:00:00 2001 From: Paul Dreik Date: Fri, 2 Aug 2024 07:34:11 +0200 Subject: [PATCH] [simdutf] make cifuzz work better for pull requests (#12293) I recently made changes to the fuzzer build script in the simdutf repo. The CIfuzz job failed. The reason is that CIfuzz checks out the default branch when building the docker image. The current dockerfile copied the build script into the docker image. This means the build script is used from the default branch, while doing CIfuzz on the PR branch. This broke when I made changes to the build script. With the changes in this PR, the build script from the checked out code (the PR to run CIfuzz on) is executed instead. That should make it more robust, and make it possible to work with improvements in the build script without having to merge first. Ping @lemire --- projects/simdutf/Dockerfile | 4 ++-- projects/simdutf/build.sh | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100755 projects/simdutf/build.sh diff --git a/projects/simdutf/Dockerfile b/projects/simdutf/Dockerfile index 4fd9e588f..0dba1a1ed 100644 --- a/projects/simdutf/Dockerfile +++ b/projects/simdutf/Dockerfile @@ -17,5 +17,5 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make cmake RUN git clone --depth 1 https://github.com/simdutf/simdutf simdutf -RUN cp simdutf/fuzz/build.sh $SRC/ -WORKDIR simdutf \ No newline at end of file +WORKDIR simdutf +COPY build.sh $SRC/ diff --git a/projects/simdutf/build.sh b/projects/simdutf/build.sh new file mode 100755 index 000000000..a21c0b123 --- /dev/null +++ b/projects/simdutf/build.sh @@ -0,0 +1,18 @@ +#!/bin/bash -eu +# Copyright 2024 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +################################################################################ + +fuzz/build.sh