chore: Clone submodules in clusterfuzzlite Dockerfile.

Needed for the build afterwards.

Also added the cflite Dockerfile to automatic CI builds so changes to it
are checked in pull requests.

Also fixed the tokstyle docker image. It needs clang instead of gcc now.
This commit is contained in:
iphydf 2022-03-30 18:13:47 +00:00
parent 7db0c80c93
commit 09575dc05b
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
3 changed files with 24 additions and 1 deletions

View File

@ -21,5 +21,6 @@ WORKDIR $SRC
COPY . $SRC/c-toxcore COPY . $SRC/c-toxcore
# Working directory for build.sh. # Working directory for build.sh.
WORKDIR $SRC/c-toxcore WORKDIR $SRC/c-toxcore
RUN git submodule update --init --recursive
# Copy build.sh into $SRC dir. # Copy build.sh into $SRC dir.
COPY ./.clusterfuzzlite/build.sh $SRC/ COPY ./.clusterfuzzlite/build.sh $SRC/

View File

@ -49,6 +49,28 @@ jobs:
cache-from: type=registry,ref=toxchat/bootstrap-node:latest-websocket cache-from: type=registry,ref=toxchat/bootstrap-node:latest-websocket
cache-to: type=inline cache-to: type=inline
docker-clusterfuzz:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
if: ${{ github.event_name == 'push' }}
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v2
with:
context: "."
file: .clusterfuzzlite/Dockerfile
push: ${{ github.event_name == 'push' }}
tags: toxchat/c-toxcore:clusterfuzz
cache-from: type=registry,ref=toxchat/c-toxcore:clusterfuzz
cache-to: type=inline
docker-fuzzer: docker-fuzzer:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

View File

@ -3,7 +3,7 @@ FROM ubuntu:20.04
RUN apt-get update && apt-get install --no-install-recommends -y \ RUN apt-get update && apt-get install --no-install-recommends -y \
ca-certificates \ ca-certificates \
gcc \ clang \
git \ git \
libopus-dev \ libopus-dev \
libsodium-dev \ libsodium-dev \