diff --git a/.github/workflows/on-master.yaml b/.github/workflows/on-master.yaml index af7367c89..eec1e18d4 100644 --- a/.github/workflows/on-master.yaml +++ b/.github/workflows/on-master.yaml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run docker build - run: docker build -t vulcanize/go-ethereum -f Dockerfile.amd64 . + run: docker build -t vulcanize/go-ethereum -f Dockerfile . - name: Get the version id: vars run: echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) diff --git a/.github/workflows/build.yml b/.github/workflows/on-pr.yml similarity index 71% rename from .github/workflows/build.yml rename to .github/workflows/on-pr.yml index 8eb113c34..1a988febd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/on-pr.yml @@ -9,4 +9,4 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run docker build - run: docker build -t vulcanize/go-ethereum -f Dockerfile.amd64 . + run: docker build -t vulcanize/go-ethereum . diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3fadf7926..475725e64 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -11,12 +11,19 @@ jobs: id: vars run: | echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7}) + echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/}) - name: Docker Login to Github Registry run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin - name: Docker Pull run: docker pull docker.pkg.github.com/vulcanize/go-ethereum/go-ethereum:${{steps.vars.outputs.sha}} - name: Copy ethereum binary file - run: docker run --rm --entrypoint cat docker.pkg.github.com/vulcanize/go-ethereum/go-ethereum:${{steps.vars.outputs.sha}} /go-ethereum/build/bin/geth > geth-linux-amd64 + run: docker run --rm --entrypoint cat docker.pkg.github.com/vulcanize/go-ethereum/go-ethereum:${{steps.vars.outputs.sha}} /usr/local/bin/geth > geth-linux-amd64 + - name: Docker Login to Docker Registry + run: echo ${{ secrets.VULCANIZEJENKINS_PAT }} | docker login -u vulcanizejenkins --password-stdin + - name: Tag docker image + run: docker tag docker.pkg.github.com/vulcanize/go-ethereum/go-ethereum:${{steps.vars.outputs.sha}} vulcanize/vdb-geth:${{steps.vars.outputs.tag}} + - name: Docker Push to Docker Hub + run: docker push vulcanize/vdb-geth:${{steps.vars.outputs.tag}} - name: Get release id: get_release uses: bruceadams/get-release@v1.2.0 diff --git a/params/version.go b/params/version.go index 8a638d077..093065668 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ const ( VersionMajor = 1 // Major version component of the current release VersionMinor = 10 // Minor version component of the current release VersionPatch = 2 // Patch version component of the current release - VersionMeta = "statediff-0.0.19" // Version metadata to append to the version string + VersionMeta = "statediff-0.0.20" // Version metadata to append to the version string ) // Version holds the textual version string.