From fb543f2d207032f635e7ad87c19105467cf7bd45 Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Wed, 23 Oct 2024 10:12:41 +0200 Subject: [PATCH] update to Go 1.23 --- .github/workflows/ci.yml | 4 ++-- .golangci.yml | 4 ++-- Makefile | 2 +- README.md | 2 +- appveyor.yml | 2 +- docs/BUILD.md | 6 +++--- go.mod | 2 +- scripts/docker_install.sh | 2 +- scripts/github-ci.sh | 2 +- scripts/osx-brew.sh | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c64bc83c8d..dc15717f27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ env: # https://docs.github.com/en/packages/guides/pushing-and-pulling-docker-images # # Keep this in sync with default in scripts/github-ci.sh. - CI_IMAGE: ghcr.io/bitboxswiss/bitbox-wallet-app-ci:24 + CI_IMAGE: ghcr.io/bitboxswiss/bitbox-wallet-app-ci:25 GITHUB_BUILD_DIR: ${{github.workspace}} jobs: @@ -99,7 +99,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Install Node.js uses: actions/setup-node@v4 with: diff --git a/.golangci.yml b/.golangci.yml index 5580d8d757..228d6e07de 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,7 +3,7 @@ # options for analysis running run: - go: "1.22" + go: "1.23" # default concurrency is a available CPU number concurrency: 4 @@ -23,7 +23,7 @@ run: # output configuration options output: # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number" - formats: + formats: - format: colored-line-number path: stdout diff --git a/Makefile b/Makefile index 5d9f415117..0df48120ed 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ gomobileinit: # Initializiation on MacOS # - run make from $GOPATH/src/github.com/BitBoxSwiss/bitbox-wallet-app # - additional dependencies: Qt 5.15 & Xcode command line tools -# - add to $PATH: /usr/local/opt/go@1.22/bin +# - add to $PATH: /usr/local/opt/go@1.23/bin osx-init: ./scripts/osx-brew.sh $(MAKE) envinit diff --git a/README.md b/README.md index dc8bcaf0a0..2c898b26ed 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The below instructions assume a unix environment. To build the app or run the development workflow, the following dependencies need to be installed: -- [Go](https://golang.org/doc/install) version 1.22 +- [Go](https://golang.org/doc/install) version 1.23 - [Node.js](https://nodejs.org/) version 20.x - [NPM](https://docs.npmjs.com/about-npm-versions) version 10.x or newer - [Qt5](https://www.qt.io) version 5.15.2 diff --git a/appveyor.yml b/appveyor.yml index 4df5c9457a..605810f62d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,7 @@ before_build: build_script: - echo on - - choco install go --version=1.22.6 + - choco install go --version=1.23.2 - go version - go env - choco install make diff --git a/docs/BUILD.md b/docs/BUILD.md index e4c8e1a988..455227a2ad 100644 --- a/docs/BUILD.md +++ b/docs/BUILD.md @@ -30,11 +30,11 @@ Build artifacts: ## MacOS -Make sure you have `qt@5/bin`, `go@1.22/bin` and `go/bin` in your PATH, i.e. add to your `.zshrc` +Make sure you have `qt@5/bin`, `go@1.23/bin` and `go/bin` in your PATH, i.e. add to your `.zshrc` ```bash export PATH="$PATH:/usr/local/opt/qt@5/bin" -export PATH="$PATH:/usr/local/opt/go@1.22/bin" +export PATH="$PATH:/usr/local/opt/go@1.23/bin" export PATH="$PATH:$HOME/go/bin" ``` @@ -73,7 +73,7 @@ xcrun altool --list-providers --username "APPLE_ID" --password "PASSWORD" The build requires `Microsoft Visual Studio 2019 Community Edition`, with the `MSVC v142 - VS 2019 C++ x64/x86 build tools (Latest)` individual component. -It also requires `mingw-w64`, `bash` (e.g. `git-bash`), `make`,`go 1.22`, `node@20`, `QT 5.15.2` with `qtwebengine`, `nsis` +It also requires `mingw-w64`, `bash` (e.g. `git-bash`), `make`,`go 1.23`, `node@20`, `QT 5.15.2` with `qtwebengine`, `nsis` and possibly other tools. Some of the tools are easy to install with `choco`: diff --git a/go.mod b/go.mod index 430be73a8d..c30d0b3f30 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/BitBoxSwiss/bitbox-wallet-app -go 1.22 +go 1.23 require ( github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20240925080402-a2115fee878e diff --git a/scripts/docker_install.sh b/scripts/docker_install.sh index f5feae5f00..92aba19b97 100755 --- a/scripts/docker_install.sh +++ b/scripts/docker_install.sh @@ -81,7 +81,7 @@ npm install -g npm@10 npm install -g locize-cli mkdir -p /opt/go_dist -curl https://dl.google.com/go/go1.22.4.linux-amd64.tar.gz | tar -xz -C /opt/go_dist +curl https://dl.google.com/go/go1.23.2.linux-amd64.tar.gz | tar -xz -C /opt/go_dist # fuse is needed to run the linuxdeployqt appimage. apt-get install -y --no-install-recommends fuse diff --git a/scripts/github-ci.sh b/scripts/github-ci.sh index 1493df7d39..f52d33ad64 100755 --- a/scripts/github-ci.sh +++ b/scripts/github-ci.sh @@ -12,7 +12,7 @@ if [ "$OS_NAME" == "linux" ]; then # Which docker image to use to run the CI. Defaults to Docker Hub. # Overwrite with CI_IMAGE=docker/image/path environment variable. # Keep this in sync with .github/workflows/ci.yml. - : "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:24}" + : "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:25}" # Time image pull to compare in the future. time docker pull "$CI_IMAGE" diff --git a/scripts/osx-brew.sh b/scripts/osx-brew.sh index 0242c68f67..f09c24446c 100755 --- a/scripts/osx-brew.sh +++ b/scripts/osx-brew.sh @@ -3,12 +3,12 @@ if [ $(arch) = "arm64" ]; then # recent M-based apple machines have an arm64 arch, but we need to install x86_64 deps arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - /usr/local/Homebrew/bin/brew install go@1.22 + /usr/local/Homebrew/bin/brew install go@1.23 /usr/local/Homebrew/bin/brew install qt@5 /usr/local/Homebrew/bin/brew install create-dmg else /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - brew install go@1.22 + brew install go@1.23 brew install qt@5 brew install create-dmg fi