From 654efa95629ca83a1fc7441e5f761348a1cb3140 Mon Sep 17 00:00:00 2001 From: Nick Hovsmith Date: Tue, 15 Oct 2024 16:19:45 -0400 Subject: [PATCH 1/6] remove docker process --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 88bbd8dabe..4c5550d199 100644 --- a/Makefile +++ b/Makefile @@ -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 -w + test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh -w + test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh -w @touch $@ .make/wasm-lib: $(DEP_PREDICATE) arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/softfloat.a $(ORDER_ONLY_PREDICATE) .make From 94e252aa24d8f7587f6faf9583a19769d742fed5 Mon Sep 17 00:00:00 2001 From: Nick Hovsmith Date: Tue, 22 Oct 2024 11:01:26 -0400 Subject: [PATCH 2/6] add flag to remove docker in docker --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4c5550d199..64d5acfd08 100644 --- a/Makefile +++ b/Makefile @@ -579,9 +579,15 @@ 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 - test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh -w - test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh -w +ifdef NODOCKERINDOCKER + test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh -w + test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh -w + test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh -w +else + 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 +endif @touch $@ .make/wasm-lib: $(DEP_PREDICATE) arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/softfloat.a $(ORDER_ONLY_PREDICATE) .make From 6680d818dbeaadf8f56729ba1bcc919d861a05ee Mon Sep 17 00:00:00 2001 From: Nick Hovsmith Date: Tue, 22 Oct 2024 12:30:59 -0400 Subject: [PATCH 3/6] update flags --- Dockerfile | 2 +- Makefile | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index aba5432254..aec8e831f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/ / diff --git a/Makefile b/Makefile index 64d5acfd08..2eb6ea54be 100644 --- a/Makefile +++ b/Makefile @@ -579,15 +579,9 @@ contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(prover_bin) @touch $@ .make/cbrotli-wasm: $(DEP_PREDICATE) $(ORDER_ONLY_PREDICATE) .make -ifdef NODOCKERINDOCKER - test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh -w - test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh -w - test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh -w -else - 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 -endif + test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh $(ARGS) + 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 From 08618e2bd61f221b950efc3e74ac6c6eea41406d Mon Sep 17 00:00:00 2001 From: Nick Hovsmith Date: Tue, 22 Oct 2024 14:08:14 -0400 Subject: [PATCH 4/6] update names and defaults --- Dockerfile | 2 +- Makefile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index aec8e831f3..aba5432254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 ARGS="-w -d" +RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header FROM scratch AS prover-header-export COPY --from=prover-header-builder /workspace/target/ / diff --git a/Makefile b/Makefile index 2eb6ea54be..5a7227ab86 100644 --- a/Makefile +++ b/Makefile @@ -579,9 +579,10 @@ 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 $(ARGS) - 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) + CBROTLI_WASM_BUILD_ARGS ?= -w -d + test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh $(CBROTLI_WASM_BUILD_ARGS) + test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh $(CBROTLI_WASM_BUILD_ARGS) + test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh $(CBROTLI_WASM_BUILD_ARGS) @touch $@ .make/wasm-lib: $(DEP_PREDICATE) arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/softfloat.a $(ORDER_ONLY_PREDICATE) .make From 82c01951094e84de8f0115765465d4c43ddf079c Mon Sep 17 00:00:00 2001 From: Nick Hovsmith Date: Wed, 23 Oct 2024 10:40:15 -0400 Subject: [PATCH 5/6] move var --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5a7227ab86..ff285ba0fb 100644 --- a/Makefile +++ b/Makefile @@ -155,6 +155,8 @@ stylus_test_hostio-test_src = $(call get_stylus_test_rust,hostio-test) stylus_test_wasms = $(stylus_test_keccak_wasm) $(stylus_test_keccak-100_wasm) $(stylus_test_fallible_wasm) $(stylus_test_storage_wasm) $(stylus_test_multicall_wasm) $(stylus_test_log_wasm) $(stylus_test_create_wasm) $(stylus_test_math_wasm) $(stylus_test_sdk-storage_wasm) $(stylus_test_erc20_wasm) $(stylus_test_read-return-data_wasm) $(stylus_test_evm-data_wasm) $(stylus_test_hostio-test_wasm) $(stylus_test_bfs:.b=.wasm) stylus_benchmarks = $(wildcard $(stylus_dir)/*.toml $(stylus_dir)/src/*.rs) $(stylus_test_wasms) +CBROTLI_WASM_BUILD_ARGS ?= -w -d + # user targets .PHONY: push @@ -579,7 +581,6 @@ contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(prover_bin) @touch $@ .make/cbrotli-wasm: $(DEP_PREDICATE) $(ORDER_ONLY_PREDICATE) .make - CBROTLI_WASM_BUILD_ARGS ?= -w -d test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh $(CBROTLI_WASM_BUILD_ARGS) test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh $(CBROTLI_WASM_BUILD_ARGS) test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh $(CBROTLI_WASM_BUILD_ARGS) From 0790c9d0d4a747a5b5d8e91cac9986804d0d3a05 Mon Sep 17 00:00:00 2001 From: Nick Hovsmith Date: Wed, 23 Oct 2024 12:25:37 -0400 Subject: [PATCH 6/6] always include -w --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ff285ba0fb..12dfb07cf8 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ stylus_test_hostio-test_src = $(call get_stylus_test_rust,hostio-test) stylus_test_wasms = $(stylus_test_keccak_wasm) $(stylus_test_keccak-100_wasm) $(stylus_test_fallible_wasm) $(stylus_test_storage_wasm) $(stylus_test_multicall_wasm) $(stylus_test_log_wasm) $(stylus_test_create_wasm) $(stylus_test_math_wasm) $(stylus_test_sdk-storage_wasm) $(stylus_test_erc20_wasm) $(stylus_test_read-return-data_wasm) $(stylus_test_evm-data_wasm) $(stylus_test_hostio-test_wasm) $(stylus_test_bfs:.b=.wasm) stylus_benchmarks = $(wildcard $(stylus_dir)/*.toml $(stylus_dir)/src/*.rs) $(stylus_test_wasms) -CBROTLI_WASM_BUILD_ARGS ?= -w -d +CBROTLI_WASM_BUILD_ARGS ?=-d # user targets @@ -581,9 +581,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 $(CBROTLI_WASM_BUILD_ARGS) - test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh $(CBROTLI_WASM_BUILD_ARGS) - test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh $(CBROTLI_WASM_BUILD_ARGS) + test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh -w $(CBROTLI_WASM_BUILD_ARGS) + test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh -w $(CBROTLI_WASM_BUILD_ARGS) + test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh -w $(CBROTLI_WASM_BUILD_ARGS) @touch $@ .make/wasm-lib: $(DEP_PREDICATE) arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/softfloat.a $(ORDER_ONLY_PREDICATE) .make