From 8a0b6cef0b82f4d7ea0752ea1e17c3e9536c48a1 Mon Sep 17 00:00:00 2001 From: Matthew Whitehead Date: Wed, 11 Sep 2024 14:51:27 +0100 Subject: [PATCH 1/2] Update to Go 1.22 Signed-off-by: Matthew Whitehead --- .github/workflows/build.yml | 2 +- .github/workflows/e2e.yml | 2 +- .github/workflows/release.yml | 2 +- go.mod | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d22b0168..3edfbe88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,6 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - name: Compile FireFly CLI run: make diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 6f638a4c..66e41b5c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -91,7 +91,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - name: Compile FireFly CLI working-directory: firefly-cli diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a60ebbc..f1e96937 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 with: diff --git a/go.mod b/go.mod index a517c039..1bcef84e 100644 --- a/go.mod +++ b/go.mod @@ -16,9 +16,9 @@ module github.com/hyperledger/firefly-cli -go 1.21 +go 1.22 -toolchain go1.21.0 +toolchain go1.22.0 require ( blockwatch.cc/tzgo v1.17.4 From 47457ddee76212583a79da71d31059164a6b1bcf Mon Sep 17 00:00:00 2001 From: Matthew Whitehead Date: Wed, 11 Sep 2024 14:52:37 +0100 Subject: [PATCH 2/2] Update FF deps Signed-off-by: Matthew Whitehead --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1bcef84e..57cb66ee 100644 --- a/go.mod +++ b/go.mod @@ -25,8 +25,8 @@ require ( github.com/briandowns/spinner v1.23.0 github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/google/go-containerregistry v0.17.0 - github.com/hyperledger/firefly-common v1.4.2 - github.com/hyperledger/firefly-signer v1.1.11 + github.com/hyperledger/firefly-common v1.4.10 + github.com/hyperledger/firefly-signer v1.1.15 github.com/jarcoal/httpmock v1.3.1 github.com/mattn/go-isatty v0.0.20 github.com/miracl/conflate v1.3.2 diff --git a/go.sum b/go.sum index 47dda66b..8ffa23e1 100644 --- a/go.sum +++ b/go.sum @@ -118,10 +118,10 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/firefly-common v1.4.2 h1:sBbiTFWDu1qCnXFA6JobasJl4AXphCAUZU/R4nyWPdE= -github.com/hyperledger/firefly-common v1.4.2/go.mod h1:jkErZdQmC9fsAJZQO427tURdwB9iiW+NMUZSqS3eBIE= -github.com/hyperledger/firefly-signer v1.1.11 h1:76t4ZrbveilfYLY87sAb7xqFJqhXZ8BLiH2BhE5be6I= -github.com/hyperledger/firefly-signer v1.1.11/go.mod h1:Ae1WDQAV6JU/sMYO+HtoWXuw6agdnRZPNZ/fnigwVg4= +github.com/hyperledger/firefly-common v1.4.10 h1:NgUYorxZF3tNkL7bBqe3PlwA42pPAYlj0wStnUsjN9Y= +github.com/hyperledger/firefly-common v1.4.10/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0= +github.com/hyperledger/firefly-signer v1.1.15 h1:oJXrX1ziDIxzSbRX+risVEmprx3McD1yi0S1S5La4zc= +github.com/hyperledger/firefly-signer v1.1.15/go.mod h1:E/TO0Koi4BqSr8hRhKJVTxiynwX/EQYjqqKrlnsQK7o= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww=