Skip to content

Commit 50c164c

Browse files
committed
go: update Go to v1.21
Needed because mockery requires 1.21: vektra/mockery@b248492
1 parent 2537247 commit 50c164c

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# options for analysis running
55
run:
6-
go: 1.20
6+
go: 1.21
77

88
# default concurrency is a available CPU number
99
concurrency: 4

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ envinit:
3333
# Initializiation on MacOS
3434
# - run make from $GOPATH/src/github.com/digitalbitbox/bitbox-wallet-app
3535
# - additional dependencies: Qt 5.15 & Xcode command line tools
36-
# - add to $PATH: /usr/local/opt/go@1.20/bin
36+
# - add to $PATH: /usr/local/opt/go@1.21/bin
3737
osx-init:
3838
./scripts/osx-brew.sh
3939
$(MAKE) envinit

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The below instructions assume a unix environment.
4747

4848
To build the app or run the development workflow, the following dependencies need to be installed:
4949

50-
- [Go](https://golang.org/doc/install) version 1.20
50+
- [Go](https://golang.org/doc/install) version 1.21
5151
- [Node.js](https://nodejs.org/) version 18.x
5252
- [NPM](https://docs.npmjs.com/about-npm-versions) version 9.x or newer
5353
- [Qt5](https://www.qt.io) version 5.15.2
@@ -193,4 +193,4 @@ Get Ethereum Goerli coins here: https://goerlifaucet.com/
193193

194194
Get Ethereum Sepolia coins here: https://faucet.sepolia.dev/
195195

196-
In case any of the Ethereum faucets are not working, you can try others from here: https://faucetlink.to (some require account creation)
196+
In case any of the Ethereum faucets are not working, you can try others from here: https://faucetlink.to (some require account creation)

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ environment:
1111

1212
# https://www.appveyor.com/docs/windows-images-software/#golang
1313
# If you change this, also change the GOROOT variable above to point to the right installation folder.
14-
stack: go 1.20
14+
stack: go 1.21
1515

1616
install:
1717
- ps: Install-Product node $env:nodejs_version

docs/BUILD.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ Build artifacts:
3030

3131
## MacOS
3232

33-
Make sure you have `qt@5/bin`, `go@1.20/bin` and `go/bin` in your PATH, i.e. add to your `.zshrc`
33+
Make sure you have `qt@5/bin`, `go@1.21/bin` and `go/bin` in your PATH, i.e. add to your `.zshrc`
3434

3535
```bash
3636
export PATH="$PATH:/usr/local/opt/qt@5/bin"
37-
export PATH="$PATH:/usr/local/opt/go@1.20/bin"
37+
export PATH="$PATH:/usr/local/opt/go@1.21/bin"
3838
export PATH="$PATH:$HOME/go/bin"
3939
```
4040

@@ -67,7 +67,7 @@ $ xcrun altool --notarization-info NOTARIZATION_ID --username "APPLE_ID" --pass
6767
The build requires `Microsoft Visual Studio 2019 Community Edition`, with the `MSVC v142 - VS 2019 C++ x64/x86 build tools (Latest)`
6868
individual component.
6969

70-
It also requires `mingw-w64`, `bash` (e.g. `git-bash`), `make`,`go 1.20`, `node@18`, `QT 5.15.2` with `qtwebengine`, `nsis`
70+
It also requires `mingw-w64`, `bash` (e.g. `git-bash`), `make`,`go 1.21`, `node@18`, `QT 5.15.2` with `qtwebengine`, `nsis`
7171
and possibly other tools.
7272

7373
Some of the tools are easy to install with `choco`:

scripts/docker_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ npm install -g npm@9.6.5
4646
npm install -g locize-cli
4747

4848
mkdir -p /opt/go_dist
49-
curl https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
49+
curl https://dl.google.com/go/go1.21.6.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
5050

5151
# Needed for qt5. fuse is needed to run the linuxdeployqt appimage.
5252
apt-get install -y --no-install-recommends fuse

scripts/osx-brew.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
if [ $(arch) = "arm64" ]; then
44
# recent M-based apple machines have an arm64 arch, but we need to install x86_64 deps
55
arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
6-
/usr/local/Homebrew/bin/brew install go@1.20
6+
/usr/local/Homebrew/bin/brew install go@1.21
77
/usr/local/Homebrew/bin/brew instal qt@5
88
else
99
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
10-
brew install go@1.20
10+
brew install go@1.21
1111
brew install qt@5
1212
fi

0 commit comments

Comments
 (0)