Skip to content

Commit be28a6a

Browse files
committed
Merge remote-tracking branch 'benma/go120'
2 parents 56677fe + 899ff17 commit be28a6a

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
# https://docs.github.com/en/packages/guides/pushing-and-pulling-docker-images
2222
#
2323
# Keep this in sync with default in scripts/travis-ci.sh.
24-
CI_IMAGE: ghcr.io/digitalbitbox/bitbox-wallet-app-ci:16
24+
CI_IMAGE: ghcr.io/digitalbitbox/bitbox-wallet-app-ci:17
2525
TRAVIS_BUILD_DIR: ${{github.workspace}}
2626

2727
jobs:
@@ -103,7 +103,7 @@ jobs:
103103
- name: Install Go
104104
uses: actions/setup-go@v2
105105
with:
106-
go-version: 1.19.x
106+
go-version: 1.20.x
107107
- name: Build macOS app
108108
run: >
109109
./scripts/travis-ci.sh qt-osx;

.golangci.yml

Lines changed: 2 additions & 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.19
6+
go: 1.20
77

88
# default concurrency is a available CPU number
99
concurrency: 4
@@ -134,6 +134,7 @@ linters:
134134
- nosnakecase
135135
- interfacebloat
136136
- revive
137+
- musttag
137138
disable-all: false
138139

139140
issues:

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ catch:
2121
@echo "Choose a make target."
2222
envinit:
2323
# Keep golangci-lint version in sync with what's in .github/workflows/ci.yml.
24-
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.50.1
24+
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.51.1
2525
go install github.com/vektra/mockery/v2@latest
2626
go install github.com/matryer/moq@latest
2727
go install golang.org/x/tools/cmd/goimports@latest
@@ -33,10 +33,10 @@ 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.19/bin
36+
# - add to $PATH: /usr/local/opt/go@1.20/bin
3737
osx-init:
3838
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
39-
brew install go@1.19
39+
brew install go@1.20
4040
brew install qt@5
4141
$(MAKE) envinit
4242
servewallet:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The below instructions assume a unix environment.
4545

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

48-
- [Go](https://golang.org/doc/install) version 1.19
48+
- [Go](https://golang.org/doc/install) version 1.20
4949
- [Node.js](https://nodejs.org/) version 14.x
5050
- [NPM](https://docs.npmjs.com/about-npm-versions) version 7.x or newer
5151
- [Qt5](https://www.qt.io) version 5.15.2

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.19
14+
stack: go 1.19 # should be 1.20, but that is not available yet, see https://www.appveyor.com/docs/windows-images-software/#golang
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.19/bin` and `go/bin` in your PATH, i.e. add to your `.zshrc`
33+
Make sure you have `qt@5/bin`, `go@1.20/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.19/bin"
37+
export PATH="$PATH:/usr/local/opt/go@1.20/bin"
3838
export PATH="$PATH:$HOME/go/bin"
3939
```
4040

@@ -65,7 +65,7 @@ $ xcrun altool --notarization-info NOTARIZATION_ID --username "APPLE_ID" --pass
6565
## Windows
6666

6767
The build requires `mingw-w64`, `bash` (e.g. `git-bash`), `make`, `Microsoft Visual Studio 2019`,
68-
`go 1.19`, `node@14`, `QT 5.15.2` with `qtwebengine`, `nsis` and possibly other tools.
68+
`go 1.20`, `node@14`, `QT 5.15.2` with `qtwebengine`, `nsis` and possibly other tools.
6969

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

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 [email protected]
4646
npm install -g locize-cli
4747

4848
mkdir -p /opt/go_dist
49-
curl https://dl.google.com/go/go1.19.3.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
49+
curl https://dl.google.com/go/go1.20.1.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/travis-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
1414
# Which docker image to use to run the CI. Defaults to Docker Hub.
1515
# Overwrite with CI_IMAGE=docker/image/path environment variable.
1616
# Keep this in sync with .github/workflows/ci.yml.
17-
: "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:16}"
17+
: "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:17}"
1818
# Time image pull to compare in the future.
1919
time docker pull "$CI_IMAGE"
2020

0 commit comments

Comments
 (0)