diff --git a/.dockerignore b/.dockerignore index bfef708858..21daaf47bf 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,5 +4,4 @@ build/_workspace build/_bin tests/testdata -plugins/**/ !plugins/build.sh diff --git a/.github/workflows/sync-and-build-plugins.yaml b/.github/workflows/sync-and-build-plugins.yaml index 14e941b5a9..ccd1f8aff2 100644 --- a/.github/workflows/sync-and-build-plugins.yaml +++ b/.github/workflows/sync-and-build-plugins.yaml @@ -6,6 +6,7 @@ on: - "pgeth" schedule: - cron: "0 * * * *" # every hour + workflow_dispatch: permissions: write-all diff --git a/Dockerfile.plugins b/Dockerfile.plugins index 95bfac74a2..c1f1e15f40 100644 --- a/Dockerfile.plugins +++ b/Dockerfile.plugins @@ -6,8 +6,6 @@ ARG BUILDNUM="" # Build Geth in a stock Go builder container FROM golang:1.21-alpine as builder -ARG PLUGIN_REPOSITORIES="" - RUN apk add --no-cache gcc musl-dev linux-headers git bash # Get dependencies - will also be cached if we won't change go.mod/go.sum @@ -18,12 +16,8 @@ RUN cd /go-ethereum && go mod download ADD . /go-ethereum RUN cd /go-ethereum -ENV PLUGIN_REPOSITORIES=${PLUGIN_REPOSITORIES} - RUN env -RUN cd /go-ethereum && /go-ethereum/pull_plugins.sh - RUN cd /go-ethereum && /go-ethereum/plugins/build.sh RUN cd /go-ethereum && go run build/ci.go install ./cmd/geth diff --git a/pull_plugins.sh b/pull_plugins.sh deleted file mode 100755 index 57c9f7d5ca..0000000000 --- a/pull_plugins.sh +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/bash - -arrPLUGINS=(${PLUGIN_REPOSITORIES//;/ }) - -mkdir -p /tmp/plugins -CWD=$(pwd) -cd ./plugins - -for i in "${arrPLUGINS[@]}" -do - echo "cloning $i" - git clone "$i" -done - -cd $CWD \ No newline at end of file