Skip to content

Commit

Permalink
ci: fix make geth (#786)
Browse files Browse the repository at this point in the history
* fix CI

* trigger CI

* add sudo

* use absolute path

* remove libzktrie

* revert CI change
  • Loading branch information
colinlyguo authored May 30, 2024
1 parent b091e4f commit ab349d6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/l2geth_ci.yml
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
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

0 comments on commit ab349d6

Please sign in to comment.