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

fix(ci): make geth #786

Merged
merged 6 commits into from
May 30, 2024
Merged

fix(ci): make geth #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e7efa3
fix CI
colinlyguo May 30, 2024
e14ba10
trigger CI
colinlyguo May 30, 2024
b991307
add sudo
colinlyguo May 30, 2024
3d46302
use absolute path
colinlyguo May 30, 2024
b0f8a3e
remove libzktrie
colinlyguo May 30, 2024
80ab182
revert CI change
colinlyguo May 30, 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: 0 additions & 2 deletions .github/workflows/l2geth_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ jobs:
uses: actions/checkout@v2
- name: Build
run: |
make libzkp
sudo cp ./rollup/circuitcapacitychecker/libzkp/libzkp.so /usr/local/lib/
make geth
check:
if: github.event.pull_request.draft == false
Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ nccc_geth: libzstd ## geth without circuit capacity checker
@echo "Run \"$(GOBIN)/geth\" to launch geth."

geth: libzkp libzstd
$(GORUN) build/ci.go install -buildtags circuit_capacity_checker ./cmd/geth
@sudo cp $(PWD)/rollup/circuitcapacitychecker/libzkp/libzkp.so $(SCROLL_LIB_PATH)
@LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(SCROLL_LIB_PATH)" CGO_LDFLAGS="-L$(SCROLL_LIB_PATH) -Wl,-rpath,$(SCROLL_LIB_PATH)" $(GORUN) build/ci.go install -buildtags circuit_capacity_checker ./cmd/geth
@echo "Done building."
@echo "Run \"$(GOBIN)/geth\" to launch geth."

Expand Down
Loading