Merge pull request #46 from alex-semenyuk/fix_mockery

Fix issue with running mockery
hyperledger · May 2, 2024 · 725918e · 725918e
2 parents 702c37a + 57ed3e5
commit 725918e
Show file tree

Hide file tree

Showing 6 changed files with 430 additions and 16 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: '1.22.2'
 
       - name: Build and Test
         run: make

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: '1.22.2'
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine3.19 AS builder
+FROM golang:1.22.2-alpine AS builder
 RUN apk add make
 ARG BUILD_VERSION
 ENV BUILD_VERSION=${BUILD_VERSION}

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/firefly-tezosconnect
 
-go 1.21
+go 1.22.2
 
 require (
 	blockwatch.cc/tzgo v1.17.1

diff --git a/mocks/fftmmocks/manager.go b/mocks/fftmmocks/manager.go