Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow builds without Docker inside of Docker for cbrotli-wasm #2748

Merged
merged 8 commits into from
Oct 23, 2024
+5 −3
Merged

Allow builds without Docker inside of Docker for cbrotli-wasm #2748

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
654efa9
remove docker process
nhovsmith-cb Oct 15, 2024
01d983c
Merge branch 'master' into master
nhovsmith-cb Oct 22, 2024
94e252a
add flag to remove docker in docker
nhovsmith-cb Oct 22, 2024
6680d81
update flags
nhovsmith-cb Oct 22, 2024
08618e2
update names and defaults
nhovsmith-cb Oct 22, 2024
827b089
Merge branch 'master' into master
nhovsmith-cb Oct 22, 2024
82c0195
move var
nhovsmith-cb Oct 23, 2024
0790c9d
always include -w
nhovsmith-cb Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ COPY --from=brotli-wasm-export / target/
COPY scripts/build-brotli.sh scripts/
COPY brotli brotli
RUN apt-get update && apt-get install -y cmake
RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header
RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header ARGS="-w -d"

FROM scratch AS prover-header-export
COPY --from=prover-header-builder /workspace/target/ /
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,9 +579,9 @@ contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(prover_bin)
@touch $@

.make/cbrotli-wasm: $(DEP_PREDICATE) $(ORDER_ONLY_PREDICATE) .make
test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh -w -d
test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh -w -d
test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh -w -d
test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh $(ARGS)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost LGTM but ARGS is way too generic for this, could we call it CBROTLI_WASM_BUILD_ARGS ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, the default for outside of docker needs to be using docker to build this. The default inside docker can be not using docker-in-docker, that's fine.

test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh $(ARGS)
test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh $(ARGS)
@touch $@

.make/wasm-lib: $(DEP_PREDICATE) arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/softfloat.a $(ORDER_ONLY_PREDICATE) .make
Expand Down