Skip to content

Commit

Permalink
chore(sdk): update to go 1.23 (trustbloc#827)
Browse files Browse the repository at this point in the history
Signed-off-by: Andrii Holovko <[email protected]>
  • Loading branch information
aholovko authored Nov 19, 2024
1 parent 9d8ea67 commit 71d5269
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 29 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name: "wallet-sdk ci"

env:
GO_VERSION: '1.22.4'
GO_VERSION: '1.23.3'

on:
push:
Expand Down Expand Up @@ -98,8 +98,8 @@ jobs:
- name: Build docker images for test server
run: |
docker build -f ./images/mocks/loginconsent/Dockerfile --no-cache -t wallet-sdk/mock-login-consent:latest \
--build-arg GO_VER=1.22 \
--build-arg ALPINE_VER=3.18 .
--build-arg GO_VER=1.23 \
--build-arg ALPINE_VER=3.20 .
- name: Save docker image as tar
run: |
docker save --output /tmp/mock-login-consent.tar wallet-sdk/mock-login-consent
Expand All @@ -121,8 +121,8 @@ jobs:
- name: Build docker images for test server
run: |
docker build -f ./images/mocks/webhook/Dockerfile --no-cache -t wallet-sdk/sample-webhook:latest \
--build-arg GO_VER=1.22 \
--build-arg ALPINE_VER=3.18 .
--build-arg GO_VER=1.23 \
--build-arg ALPINE_VER=3.20 .
- name: Save docker image as tar
run: |
docker save --output /tmp/mock-sample-webhook.tar wallet-sdk/sample-webhook
Expand All @@ -144,8 +144,8 @@ jobs:
- name: Build docker images for test server
run: |
docker build -f ./images/mocks/trustregistry/Dockerfile --no-cache -t wallet-sdk/mock-trust-registry:latest \
--build-arg GO_VER=1.22 \
--build-arg ALPINE_VER=3.18 .
--build-arg GO_VER=1.23 \
--build-arg ALPINE_VER=3.20 .
- name: Save docker image as tar
run: |
docker save --output /tmp/mock-trust-registry.tar wallet-sdk/mock-trust-registry
Expand All @@ -167,8 +167,8 @@ jobs:
- name: Build docker images for test server
run: |
docker build -f ./images/mocks/attestation/Dockerfile --no-cache -t wallet-sdk/mock-attestation:latest \
--build-arg GO_VER=1.22 \
--build-arg ALPINE_VER=3.18 .
--build-arg GO_VER=1.23 \
--build-arg ALPINE_VER=3.20 .
- name: Save docker image as tar
run: |
docker save --output /tmp/mock-attestation.tar wallet-sdk/mock-attestation
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name: "wallet-sdk release"

env:
GO_VERSION: '1.22'
GO_VERSION: '1.23'

on:
push:
Expand All @@ -32,7 +32,7 @@ jobs:
cd ..
git clone https://go.googlesource.com/go goroot
cd goroot
git checkout go1.22.2
git checkout go1.23.3
cp ../wallet-sdk/cmd/wallet-sdk-gomobile/gopatches/* ./
git apply cmd_cgo__fix_unaligned_arguments_typedmemmove_crash_on_iOS.patch
cd src && ./all.bash
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
cd ..
git clone https://go.googlesource.com/go goroot
cd goroot
git checkout go1.22.2
git checkout go1.23.3
cp ../wallet-sdk/cmd/wallet-sdk-gomobile/gopatches/* ./
git apply cmd_cgo__fix_unaligned_arguments_typedmemmove_crash_on_iOS.patch
cd src && ./all.bash
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ else
PATH:=$(PATH);$(subst /,\\,$(GOBIN_PATH))
endif

ALPINE_VER ?= 3.18
GO_ALPINE_VER ?= 3.18
GO_VER ?= 1.22
ALPINE_VER ?= 3.20
GO_ALPINE_VER ?= 3.20
GO_VER ?= 1.23

NEW_VERSION ?= $(shell git describe --tags --always `git rev-list --tags --max-count=1`)-SNAPSHOT-$(shell git rev-parse --short=7 HEAD)
GIT_REV ?= $(shell git rev-parse HEAD)
Expand Down
2 changes: 1 addition & 1 deletion cmd/wallet-sdk-gomobile/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This package contains the `gomobile`-compatible version of the SDK. It acts as a

## Prerequisites

* [Go 1.22](https://go.dev/doc/install) or newer
* [Go 1.23](https://go.dev/doc/install) or newer
* The gomobile tools:
```
go install golang.org/x/mobile/cmd/gomobile@latest
Expand Down
4 changes: 2 additions & 2 deletions cmd/wallet-sdk-gomobile/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

module github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile

go 1.22.0
go 1.23

toolchain go1.22.2
toolchain go1.23.3

require (
github.com/go-jose/go-jose/v3 v3.0.1
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

module github.com/trustbloc/wallet-sdk

go 1.22
go 1.23

toolchain go1.23.3

require (
github.com/PaesslerAG/jsonpath v0.1.1
Expand Down
2 changes: 1 addition & 1 deletion scripts/check_lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -e
echo "Running $0"

DOCKER_CMD=${DOCKER_CMD:-docker}
GOLANGCI_LINT_IMAGE="golangci/golangci-lint:v1.57.1"
GOLANGCI_LINT_IMAGE="golangci/golangci-lint:v1.62.0"

if [ ! $(command -v ${DOCKER_CMD}) ]; then
exit 0
Expand Down
4 changes: 3 additions & 1 deletion test/integration/attestation/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

module github.com/trustbloc/wallet-sdk/test/integration/attestation

go 1.22
go 1.23

toolchain go1.23.3

require (
github.com/google/uuid v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions test/integration/cli/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

module github.com/trustbloc/wallet-sdk/test/integration/helper

go 1.22.0
go 1.23

toolchain go1.22.2
toolchain go1.23.3

require github.com/trustbloc/wallet-sdk/test/integration v0.0.0-20221207181956-419a3951143f

Expand Down
4 changes: 1 addition & 3 deletions test/integration/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@

module github.com/trustbloc/wallet-sdk/test/integration

go 1.22.0

toolchain go1.22.2
go 1.23

require (
github.com/google/uuid v1.3.0
Expand Down
2 changes: 1 addition & 1 deletion test/integration/loginconsent/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module github.com/trustbloc/vcs/test/bdd/loginconsent

go 1.22
go 1.23

require (
github.com/google/uuid v1.3.0
Expand Down
2 changes: 1 addition & 1 deletion test/integration/trustregistry/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

module github.com/trustbloc/wallet-sdk/test/integration/trustregistry-mock

go 1.22.0
go 1.23

require (
github.com/gorilla/mux v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion test/integration/webhook/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module github.com/trustbloc/wallet-sdk/test/integration/webhook

go 1.22
go 1.23

require (
github.com/gorilla/mux v1.8.0
Expand Down

0 comments on commit 71d5269

Please sign in to comment.