Merge branch 'main' of github.com:hyperledger-labs/firefly-ethconnect…

… into fix-162

.github/workflows/docker.yml

@@ -1,9 +1,8 @@
 name: Docker
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types: [published, prereleased]
 
 jobs:
   docker:
@@ -12,9 +11,19 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build
-        run: docker build -t ghcr.io/hyperledger/firefly-ethconnect:latest .
-
-      - name: Push
+        run: docker build -t ghcr.io/hyperledger/firefly-ethconnect:$GITHUB_REF .
+
+      - name: Tag release
+        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: |
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+          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
+          docker push ghcr.io/hyperledger/firefly-ethconnect:$latest

.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

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

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