From ab349d6443352384167ac333cb804e4358c7de9f Mon Sep 17 00:00:00 2001 From: colin <102356659+colinlyguo@users.noreply.github.com> Date: Thu, 30 May 2024 14:45:13 +0800 Subject: [PATCH] ci: fix make geth (#786) * fix CI * trigger CI * add sudo * use absolute path * remove libzktrie * revert CI change --- .github/workflows/l2geth_ci.yml | 2 -- Makefile | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/l2geth_ci.yml b/.github/workflows/l2geth_ci.yml index 5296a03f4402..6cf49d104fcf 100644 --- a/.github/workflows/l2geth_ci.yml +++ b/.github/workflows/l2geth_ci.yml @@ -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 diff --git a/Makefile b/Makefile index 91da337529f7..691beeaad431 100644 --- a/Makefile +++ b/Makefile @@ -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."