diff options
| author | Ruben ten Hove <git@rhtenhove.nl> | 2022-06-28 15:59:56 +0000 |
|---|---|---|
| committer | Ruben ten Hove <git@rhtenhove.nl> | 2022-06-28 15:59:56 +0000 |
| commit | 3e65e1a029c44b33a77ca04724335ee3ecd30e67 (patch) | |
| tree | 76b76e4b93816a5eee50b859666939582dca1e1e | |
| parent | b3edb657c2221f7d292931c8df04388c552737dd (diff) | |
| download | afl++-3e65e1a029c44b33a77ca04724335ee3ecd30e67.tar.gz | |
fix test using test specific build
| -rw-r--r-- | .github/workflows/codeql-analysis.yml (renamed from .github/workflows/codeql-analysis.yaml) | 2 | ||||
| -rw-r--r-- | .github/workflows/container.yml (renamed from .github/workflows/container.yaml) | 11 | ||||
| -rw-r--r-- | Dockerfile | 12 |
3 files changed, 18 insertions, 7 deletions
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yml index c9efb296..ba6792b1 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yml @@ -7,7 +7,7 @@ on: branches: [stable, dev] jobs: - codeql: + analyze: name: Analyze runs-on: ubuntu-latest container: # We use a previous image as it's expected to have all the dependencies diff --git a/.github/workflows/container.yaml b/.github/workflows/container.yml index 81e2a3f8..8836997d 100644 --- a/.github/workflows/container.yaml +++ b/.github/workflows/container.yml @@ -23,11 +23,18 @@ jobs: uses: docker/build-push-action@v3 with: context: . - tags: aflplusplus:amd64 + tags: aflplusplus:test-amd64 load: true cache-to: type=gha,mode=max + build-args: | + TEST_BUILD=1 - name: Test amd64 - run: docker run --rm aflplusplus:amd64 bash -c "apt-get update && apt-get install -y libcmocka-dev && make -i tests" + run: > + docker run --rm aflplusplus:test-amd64 bash -c " + apt-get update && + apt-get install -y libcmocka-dev && + make -i tests + " push: name: Push amd64 and arm64 images diff --git a/Dockerfile b/Dockerfile index a9be22de..29ca2a5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,11 +63,11 @@ RUN git clone --depth=1 https://github.com/vanhauser-thc/afl-cov && \ (cd afl-cov && make install) && rm -rf afl-cov # Until gcc v12.1 is released for ubuntu https://bugs.launchpad.net/ubuntu/+source/gcc-11/+bug/1940029 -ARG NO_NYX=1 +ENV NO_NYX=1 # Build currently broken -ARG NO_CORESIGHT=1 -ARG NO_UNICORN_ARM64=1 +ENV NO_CORESIGHT=1 +ENV NO_UNICORN_ARM64=1 WORKDIR /AFLplusplus COPY . . @@ -75,8 +75,12 @@ COPY . . ARG CC=gcc-$GCC_VERSION ARG CXX=g++-$GCC_VERSION +# Used in CI to prevent a 'make clean' which would remove the binaries to be tested +ARG TEST_BUILD + RUN sed -i.bak 's/^ -/ /g' GNUmakefile && \ - make clean && make distrib && make install && make clean && \ + make clean && make distrib && \ + ([ "${TEST_BUILD}" ] || (make install && make clean)) && \ mv GNUmakefile.bak GNUmakefile RUN echo "set encoding=utf-8" > /root/.vimrc && \ |