From 524db30f12727d95eb42bebb0323457fa81635f0 Mon Sep 17 00:00:00 2001 From: "Rodrigo Q. Saramago" Date: Fri, 17 Feb 2023 11:16:50 +0100 Subject: [PATCH] Update ubuntu ossfuzz references --- .circleci/config.yml | 24 +++++++++---------- .github/workflows/buildpack-deps.yml | 4 ++-- ...ildpack-deps_test_ubuntu.clang.ossfuzz.sh} | 0 scripts/docker/buildpack-deps/README.md | 2 +- test/tools/ossfuzz/README.md | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) rename scripts/ci/{buildpack-deps_test_ubuntu1604.clang.ossfuzz.sh => buildpack-deps_test_ubuntu.clang.ossfuzz.sh} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2efe62ed..174c4e78f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,11 +17,11 @@ parameters: default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7f0b62da2aa0920660e67cd17fb3a7f6c57d7da72454003056f3bd27bbda2075" ubuntu-2204-clang-docker-image: type: string - # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-2 - default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0d4fa1da806f9b3daabd2d1dc0842899af794a838e475c14045c3fb289cc8103" - ubuntu-1604-clang-ossfuzz-docker-image: + # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-1 + default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e515710752bfb38ee0e9b2f92ca71612c03ed85290c36c3b3c0a3d9f90187aef" + ubuntu-clang-ossfuzz-docker-image: type: string - # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-23 + # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-23 default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a84f67829ec2fdcfc8a61ebf22f9dc27b04a9edeb1531565ab3e0ebb1cbc4a0" emscripten-docker-image: type: string @@ -343,15 +343,15 @@ defaults: TERM: xterm MAKEFLAGS: -j 2 - - base_ubuntu1604_clang: &base_ubuntu1604_clang + - base_ubuntu_clang: &base_ubuntu_clang docker: - - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >> + - image: << pipeline.parameters.ubuntu-clang-ossfuzz-docker-image >> environment: TERM: xterm MAKEFLAGS: -j 3 - - base_ubuntu1604_clang_small: &base_ubuntu1604_clang_small - <<: *base_ubuntu1604_clang + - base_ubuntu_clang_small: &base_ubuntu_clang_small + <<: *base_ubuntu_clang resource_class: small environment: TERM: xterm @@ -510,7 +510,7 @@ defaults: requires: - b_ems - - workflow_ubuntu1604_ossfuzz: &workflow_ubuntu1604_ossfuzz + - workflow_ubuntu_ossfuzz: &workflow_ubuntu_ossfuzz <<: *workflow_trigger_on_tags requires: - b_ubu_ossfuzz @@ -916,7 +916,7 @@ jobs: - matrix_notify_failure_unless_pr b_ubu_ossfuzz: &b_ubu_ossfuzz - <<: *base_ubuntu1604_clang + <<: *base_ubuntu_clang steps: - checkout - run: *setup_prerelease_commit_hash @@ -925,7 +925,7 @@ jobs: - matrix_notify_failure_unless_pr t_ubu_ossfuzz: &t_ubu_ossfuzz - <<: *base_ubuntu1604_clang_small + <<: *base_ubuntu_clang_small steps: - checkout - attach_workspace: @@ -1711,7 +1711,7 @@ workflows: jobs: # OSSFUZZ builds and (regression) tests - b_ubu_ossfuzz: *workflow_trigger_on_tags - - t_ubu_ossfuzz: *workflow_ubuntu1604_ossfuzz + - t_ubu_ossfuzz: *workflow_ubuntu_ossfuzz # Code Coverage enabled build and tests - b_ubu_codecov: *workflow_trigger_on_tags diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml index 4d3918d94..6a261bd2e 100644 --- a/.github/workflows/buildpack-deps.yml +++ b/.github/workflows/buildpack-deps.yml @@ -5,7 +5,7 @@ on: branches: [ develop ] paths: - 'scripts/docker/buildpack-deps/Dockerfile.emscripten' - - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz' + - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang' - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204' @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204] + image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204] steps: - uses: actions/checkout@v2 diff --git a/scripts/ci/buildpack-deps_test_ubuntu1604.clang.ossfuzz.sh b/scripts/ci/buildpack-deps_test_ubuntu.clang.ossfuzz.sh similarity index 100% rename from scripts/ci/buildpack-deps_test_ubuntu1604.clang.ossfuzz.sh rename to scripts/ci/buildpack-deps_test_ubuntu.clang.ossfuzz.sh diff --git a/scripts/docker/buildpack-deps/README.md b/scripts/docker/buildpack-deps/README.md index 7f6352581..15cb71f5b 100644 --- a/scripts/docker/buildpack-deps/README.md +++ b/scripts/docker/buildpack-deps/README.md @@ -27,7 +27,7 @@ If the version check was successful, the docker image will be built using the Do The resulting docker image will be tested by executing the corresponding `scripts/ci/buildpack-deps_test_*` scripts. Some of these scripts are symlinked to `scripts/ci/build.sh`, except the following two: - * `buildpack-deps-ubuntu1604.clang.ossfuzz` => `scripts/ci/build_ossfuzz.sh` + * `buildpack-deps-ubuntu.clang.ossfuzz` => `scripts/ci/build_ossfuzz.sh` * `buildpack-deps_test_emscripten.sh` => `scripts/ci/build_emscripten.sh` These scripts `scripts/ci/build.sh` and `scripts/ci/build_ossfuzz.sh` are also used by CircleCI, see `.circleci/config.yml`. diff --git a/test/tools/ossfuzz/README.md b/test/tools/ossfuzz/README.md index 944595a3f..9343602d4 100644 --- a/test/tools/ossfuzz/README.md +++ b/test/tools/ossfuzz/README.md @@ -6,11 +6,11 @@ We have multiple fuzzers, some based on string input and others on protobuf input. To build them, please do the following: -- Create a local docker image from `Dockerfile.ubuntu1604.clang.ossfuzz` in the `.circleci/docker` sub-directory. Please note that this step is likely to take at least an hour to complete. Therefore, it is recommended to do it when you are away from the computer (and the computer is plugged to power since we do not want a battery drain). +- Create a local docker image from `Dockerfile.ubuntu.clang.ossfuzz` in the `.circleci/docker` sub-directory. Please note that this step is likely to take at least an hour to complete. Therefore, it is recommended to do it when you are away from the computer (and the computer is plugged to power since we do not want a battery drain). ``` $ cd .circleci/docker -$ docker build -t solidity-ossfuzz-local -f Dockerfile.ubuntu1604.clang.ossfuzz . +$ docker build -t solidity-ossfuzz-local -f Dockerfile.ubuntu.clang.ossfuzz . ``` - Login to the docker container sourced from the image built in the previous step from the solidity parent directory