Skip to content

Commit

Permalink
ci: use turbo in dockerfiles (#243)
Browse files Browse the repository at this point in the history
  • Loading branch information
dbanks12 authored and ludamad committed Apr 17, 2023
1 parent 5c2ee50 commit 7262f34
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion circuits/cpp/dockerfiles/Dockerfile.arm64-linux-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
FROM aztecprotocol/crosstool-ng-arm64:latest
WORKDIR /usr/src/aztec3-circuits/cpp
COPY . .
RUN cmake --toolchain ./cmake/toolchains/aarch64-linux.cmake --preset gcc && cmake --build --preset gcc
RUN cmake --toolchain ./cmake/toolchains/aarch64-linux.cmake --preset gcc -DUSE_TURBO=true && cmake --build --preset gcc
RUN cd build && for test in ./bin/*_tests; do qemu-aarch64 $test; done
ENTRYPOINT /bin/bash
2 changes: 1 addition & 1 deletion circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /usr/src/aztec3-circuits/cpp/barretenberg/cpp/src
RUN curl -s -L https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz | tar zxfv -
WORKDIR /usr/src/aztec3-circuits/cpp
COPY . .
RUN cmake --preset wasm && cmake --build --preset wasm
RUN cmake --preset wasm -DUSE_TURBO=true && cmake --build --preset wasm

FROM alpine:3.17
COPY --from=builder /usr/src/aztec3-circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/aztec3-circuits/cpp/build-wasm/bin/aztec3-circuits.wasm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN curl -s -L https://github.com/CraneStation/wasi-sdk/releases/download/wasi-s
WORKDIR /usr/src/aztec3-circuits/cpp
COPY . .

RUN cmake --preset wasm && cmake --build --preset wasm
RUN cmake --preset wasm -DUSE_TURBO=true && cmake --build --preset wasm

FROM ubuntu:kinetic
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y xz-utils curl
Expand Down
2 changes: 1 addition & 1 deletion circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ WORKDIR /usr/src/aztec3-circuits/cpp

COPY . .
# Build the entire project, as we want to check everything builds under clang
RUN cmake --preset default && cmake --build --preset default
RUN cmake --preset default -DUSE_TURBO=true && cmake --build --preset default

FROM alpine:3.17
RUN apk update && apk add openmp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ WORKDIR /usr/src/aztec3-circuits/cpp

COPY . .
# Build everything to ensure everything builds. All tests will be run from the result of this build.
RUN cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DCI=ON && cmake --build --preset default
RUN cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DCI=ON -DUSE_TURBO=true && cmake --build --preset default

FROM alpine:3.17
RUN apk update && apk add curl openmp
Expand Down
2 changes: 1 addition & 1 deletion circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apk update \
WORKDIR /usr/src/aztec3-circuits/cpp
COPY . .
# Build the entire project, as we want to check everything builds under gcc.
RUN cmake --preset gcc -DCI=ON && cmake --build --preset gcc
RUN cmake --preset gcc -DCI=ON -DUSE_TURBO=true && cmake --build --preset gcc

FROM alpine:3.17
RUN apk update && apk add libstdc++ libgomp
Expand Down

0 comments on commit 7262f34

Please sign in to comment.