cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update ubuntu ossfuzz references

Browse Source
This commit is contained in:
Rodrigo Q. Saramago 2023-02-17 11:16:50 +01:00
parent f78591c356
commit 524db30f12
No known key found for this signature in database
GPG Key ID: 9B36B2525704A359
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.circleci/config.yml
View File

@ -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

4
.github/workflows/buildpack-deps.yml vendored
View File

@ -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

0
scripts/ci/buildpack-deps_test_ubuntu1604.clang.ossfuzz.sh → scripts/ci/buildpack-deps_test_ubuntu.clang.ossfuzz.sh
View File

2
scripts/docker/buildpack-deps/README.md
View File

@ -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`.

4
test/tools/ossfuzz/README.md
View File

@ -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