Skip to content

Commit c275273

Browse files
authored
Fix CI by removing espresso crypto helper (EspressoSystems#729)
* Fix CI by removing espresso crypto helper * remove unwanted code * remove unwanted code 2
1 parent 30bb151 commit c275273

File tree

5 files changed

+1
-116
lines changed

5 files changed

+1
-116
lines changed

.github/workflows/gotestsum.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,6 @@ while [[ $# -gt 0 ]]; do
5656
done
5757

5858
###### Espresso
59-
# 1. First ensure the library path is set
60-
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$(pwd)/target/lib"
61-
62-
# 2. Verify the library exists
63-
if [[ ! -f "$(pwd)/target/lib/libespresso_crypto_helper-x86_64-unknown-linux-gnu.so" ]]; then
64-
echo "Error: libespresso_crypto_helper-x86_64-unknown-linux-gnu.so not found in $(pwd)/target/lib"
65-
exit 1
66-
fi
6759

6860
skip_tests=$(grep -vE '^\s*#|^\s*$' ci_skip_tests | tr '\n' '|' | sed 's/|$//')
6961
######

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ RUN apt-get update && \
268268
RUN export DEBIAN_FRONTEND=noninteractive && \
269269
apt-get update && \
270270
apt-get install -y wabt
271-
COPY scripts/prepare-espresso-crypto-helper scripts/
272271
COPY go.mod go.sum ./
273272
COPY go-ethereum/go.mod go-ethereum/go.sum go-ethereum/
274273
COPY fastcache/go.mod fastcache/go.sum fastcache/

Makefile

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -160,47 +160,6 @@ stylus_benchmarks = $(wildcard $(stylus_dir)/*.toml $(stylus_dir)/src/*.rs) $(st
160160
CBROTLI_WASM_BUILD_ARGS ?=-d
161161

162162

163-
# Normalize architecture names
164-
ifeq ($(UNAME_M),arm64)
165-
# Apple Silicon reports as arm64, but Rust uses aarch64
166-
DETECTED_ARCH := aarch64
167-
else
168-
DETECTED_ARCH := $(UNAME_M)
169-
endif
170-
171-
# Determine target triple
172-
ifeq ($(DETECTED_ARCH),aarch64)
173-
ifeq ($(UNAME_S),Darwin)
174-
TRIPLE := aarch64-apple-darwin
175-
else
176-
TRIPLE := aarch64-unknown-linux-gnu
177-
endif
178-
else ifeq ($(DETECTED_ARCH),x86_64)
179-
ifeq ($(UNAME_S),Darwin)
180-
TRIPLE := x86_64-apple-darwin
181-
else
182-
TRIPLE := x86_64-unknown-linux-gnu
183-
endif
184-
else
185-
$(error Architecture $(DETECTED_ARCH) is not supported)
186-
endif
187-
188-
# Set library extension based on OS
189-
ifeq ($(UNAME_S),Darwin)
190-
LIB_EXT := dylib
191-
espresso_crypto_filename = libespresso_crypto_helper.dylib
192-
else
193-
LIB_EXT := so
194-
export LD_LIBRARY_PATH := $(shell pwd)/target/lib:$LD_LIBRARY_PATH
195-
endif
196-
197-
CBROTLI_WASM_BUILD_ARGS ?=-d
198-
199-
# user targets
200-
.PHONY: build-espresso-crypto-lib
201-
build-espresso-crypto-lib:
202-
./scripts/prepare-espresso-crypto-helper
203-
204163
.PHONY: push
205164
push: lint test-go .make/fmt
206165
@printf "%bdone building %s%b\n" $(color_pink) $$(expr $$(echo $? | wc -w) - 1) $(color_reset)
@@ -215,7 +174,7 @@ build: $(patsubst %,$(output_root)/bin/%, nitro deploy relay daprovider daserver
215174
@printf $(done)
216175

217176
.PHONY: build-node-deps
218-
build-node-deps: $(go_source) build-prover-header build-prover-lib build-jit .make/solgen .make/cbrotli-lib build-espresso-crypto-lib
177+
build-node-deps: $(go_source) build-prover-header build-prover-lib build-jit .make/solgen .make/cbrotli-lib
219178

220179
.PHONY: test-go-deps
221180
test-go-deps: \
@@ -341,9 +300,6 @@ clean:
341300
@rm -rf contracts-local/out contracts-local/forge-cache
342301
@rm -f .make/*
343302
rm -rf brotli/buildfiles
344-
@rm -f $(output_root)/lib/$(espresso_crypto_filename)
345-
rm -f $(ESPRESSO_TAR)
346-
rm -rf $(ESPRESSO_DIR)
347303
# Ensure lib64 is a symlink to lib
348304
mkdir -p $(output_root)/lib
349305
ln -s lib $(output_root)/lib64

scripts/prepare-espresso-crypto-helper

Lines changed: 0 additions & 53 deletions
This file was deleted.

scripts/run-espresso-ci-job

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
# This script runs the Espresso tests in ./system_tests only.
33
set -euo pipefail
44

5-
# 1. First ensure the library path is set
6-
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$(pwd)/target/lib"
7-
8-
# 2. Verify the library exists
9-
if [[ ! -f "$(pwd)/target/lib/libespresso_crypto_helper-x86_64-unknown-linux-gnu.so" ]]; then
10-
echo "Error: libespresso_crypto_helper-x86_64-unknown-linux-gnu.so not found in $(pwd)/target/lib"
11-
exit 1
12-
fi
13-
145
gotestsum \
156
--format short-verbose \
167
--packages="github.com/offchainlabs/nitro/system_tests" \

0 commit comments

Comments
 (0)