From 1ec164924d1cdf2af27585dd83126f90746c6e5a Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Mon, 11 Oct 2021 14:19:59 -0400 Subject: [PATCH 1/7] Create tagged image when publishing a release Signed-off-by: Nicko Guyer --- .github/workflows/docker.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f414a963..e211ab5e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,6 +4,9 @@ on: push: branches: - main + release: + types: + - published jobs: docker: @@ -13,8 +16,12 @@ jobs: - name: Build run: docker build -t ghcr.io/hyperledger/firefly-ethconnect:latest . - - - name: Push + + - name: Tag release + if: github.event_name == 'release' && github.event.action == 'published' + run: docker tag ghcr.io/hyperledger/firefly-ethconnect:latest ghcr.io/hyperledger/firefly-ethconnect:$GITHUB_REF + + - name: Push docker image run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker push ghcr.io/hyperledger/firefly-ethconnect:latest + docker push -a ghcr.io/hyperledger/firefly-ethconnect \ No newline at end of file From 0a77fdf48c48cc892cde79609601a3caa47b515f Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Mon, 11 Oct 2021 14:59:26 -0400 Subject: [PATCH 2/7] Only build docker images on releases Signed-off-by: Nicko Guyer --- .github/workflows/docker.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e211ab5e..754536b4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,9 +1,6 @@ name: Docker on: - push: - branches: - - main release: types: - published @@ -18,7 +15,6 @@ jobs: run: docker build -t ghcr.io/hyperledger/firefly-ethconnect:latest . - name: Tag release - if: github.event_name == 'release' && github.event.action == 'published' run: docker tag ghcr.io/hyperledger/firefly-ethconnect:latest ghcr.io/hyperledger/firefly-ethconnect:$GITHUB_REF - name: Push docker image From 82f6ded698ae4a86b30cfcdb9f94e5cf293bbdca Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Mon, 11 Oct 2021 15:42:53 -0400 Subject: [PATCH 3/7] Do not update latest docker tag for pre-releases Signed-off-by: Nicko Guyer --- .github/workflows/docker.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 754536b4..27e15b9f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ name: Docker on: release: types: - - published + - [published, prereleased] jobs: docker: @@ -12,10 +12,11 @@ jobs: - uses: actions/checkout@v2 - name: Build - run: docker build -t ghcr.io/hyperledger/firefly-ethconnect:latest . + run: docker build -t ghcr.io/hyperledger/firefly-ethconnect:$GITHUB_REF . - name: Tag release - run: docker tag ghcr.io/hyperledger/firefly-ethconnect:latest ghcr.io/hyperledger/firefly-ethconnect:$GITHUB_REF + if: github.event.action == 'published' + run: docker tag ghcr.io/hyperledger/firefly-ethconnect:latest ghcr.io/hyperledger/firefly-ethconnect:latest - name: Push docker image run: | From 187a3eb490c92528db5c8cf9e2804771a9a38d53 Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Mon, 11 Oct 2021 15:50:06 -0400 Subject: [PATCH 4/7] Remove -a flag from docker push Signed-off-by: Nicko Guyer --- .github/workflows/docker.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 27e15b9f..8e1ce886 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,4 +21,10 @@ jobs: - name: Push docker image run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - docker push -a ghcr.io/hyperledger/firefly-ethconnect \ No newline at end of file + docker push ghcr.io/hyperledger/firefly-ethconnect:$GITHUB_REF + + - name: Push latest tag + if: github.event.action == 'published' + run: | + echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin + docker push ghcr.io/hyperledger/firefly-ethconnect:$latest \ No newline at end of file From dd904db741b85c385e0f92f6ca8240100a2fe87d Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Mon, 11 Oct 2021 16:10:59 -0400 Subject: [PATCH 5/7] Fix docker release trigger Signed-off-by: Nicko Guyer --- .github/workflows/docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8e1ce886..c61710d9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,8 +2,7 @@ name: Docker on: release: - types: - - [published, prereleased] + types: [published, prereleased] jobs: docker: From f70d0279f03cfc748caf0382e6a23ec6ef88ac42 Mon Sep 17 00:00:00 2001 From: Peter Broadhurst Date: Mon, 11 Oct 2021 16:13:29 -0400 Subject: [PATCH 6/7] Update ref to latest ethbinding Signed-off-by: Peter Broadhurst --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index dfc908fb..62b3b424 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d github.com/icza/dyno v0.0.0-20200205103839-49cb13720835 github.com/julienschmidt/httprouter v1.3.0 - github.com/kaleido-io/ethbinding v0.0.0-20210527224458-a2622d9a2bde + github.com/kaleido-io/ethbinding v0.0.0-20210901174425-3b4290c196a9 github.com/klauspost/compress v1.12.3 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.13 // indirect From f9c13fd7594801e669ee442f0ae8b2a2507f10ba Mon Sep 17 00:00:00 2001 From: Peter Broadhurst Date: Mon, 11 Oct 2021 16:49:06 -0400 Subject: [PATCH 7/7] Add debug to test when running in Github task Signed-off-by: Peter Broadhurst --- .github/workflows/go.yaml | 2 ++ Makefile | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 40cbc275..2a550359 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -30,6 +30,8 @@ jobs: sudo chmod 755 /usr/local/bin/solc - name: Build and Test + env: + TEST_DEBUG_FLAGS: -v run: cd ethconnect && make - name: Upload coverage diff --git a/Makefile b/Makefile index 03cf429e..0c40334e 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ BINARY_NAME=ethconnect BINARY_UNIX=$(BINARY_NAME)-tux BINARY_MAC=$(BINARY_NAME)-mac BINARY_WIN=$(BINARY_NAME)-win +TEST_DEBUG_FLAGS?= GOBIN := $(shell $(VGO) env GOPATH)/bin MOCKERY := $(GOBIN)/mockery @@ -23,7 +24,7 @@ delv-ethbinding: force # "plugin was built with a different version of package runtime/internal/sys" go build -buildmode=plugin -gcflags='all=-N -l' github.com/kaleido-io/ethbinding coverage.txt: $(GOFILES) - $(VGO) test ./... -cover -coverprofile=coverage.txt -covermode=atomic -timeout 30s + $(VGO) test ./... ${TEST_DEBUG_FLAGS} -cover -coverprofile=coverage.txt -covermode=atomic -timeout 30s coverage.html: $(VGO) tool cover -html=coverage.txt test: coverage.txt