Skip to content

Commit

Permalink
chore(deps): update go to 1.22, appveyor changed from go121 to go
Browse files Browse the repository at this point in the history
  • Loading branch information
baizon committed Jun 11, 2024
1 parent 95cc366 commit 509da20
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
- name: Build macOS app
run: >
./scripts/github-ci.sh qt-osx;
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# options for analysis running
run:
go: 1.21
go: "1.22"

# default concurrency is a available CPU number
concurrency: 4
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ envinit:
# 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.21/bin
# - add to $PATH: /usr/local/opt/go@1.22/bin
osx-init:
./scripts/osx-brew.sh
$(MAKE) envinit
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.21
- [Go](https://golang.org/doc/install) version 1.22
- [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
Expand Down
6 changes: 2 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ environment:
nodejs_version: "20"
matrix:
- QT: C:\Qt\5.15.2\msvc2019_64
GOROOT: C:\go121
GOROOT: C:\go
GOPATH: C:\gopath\
PLATFORM: amd64
COMPILER: msvc

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

install:
- ps: Install-Product node $env:nodejs_version
Expand Down
6 changes: 3 additions & 3 deletions docs/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ Build artifacts:

## MacOS

Make sure you have `qt@5/bin`, `go@1.21/bin` and `go/bin` in your PATH, i.e. add to your `.zshrc`
Make sure you have `qt@5/bin`, `go@1.22/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.21/bin"
export PATH="$PATH:/usr/local/opt/go@1.22/bin"
export PATH="$PATH:$HOME/go/bin"
```

Expand Down Expand Up @@ -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.21`, `node@20`, `QT 5.15.2` with `qtwebengine`, `nsis`
It also requires `mingw-w64`, `bash` (e.g. `git-bash`), `make`,`go 1.22`, `node@20`, `QT 5.15.2` with `qtwebengine`, `nsis`
and possibly other tools.

Some of the tools are easy to install with `choco`:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/BitBoxSwiss/bitbox-wallet-app

go 1.21
go 1.22

require (
github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20240531104813-fa7f932bdd38
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ npm install -g npm@10
npm install -g locize-cli

mkdir -p /opt/go_dist
curl https://dl.google.com/go/go1.21.6.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
curl https://dl.google.com/go/go1.22.4.linux-amd64.tar.gz | tar -xz -C /opt/go_dist

# Needed for qt5. fuse is needed to run the linuxdeployqt appimage.
apt-get install -y --no-install-recommends fuse
Expand Down
4 changes: 2 additions & 2 deletions scripts/osx-brew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.21
/usr/local/Homebrew/bin/brew install go@1.22
/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.21
brew install go@1.22
brew install qt@5
brew install create-dmg
fi

0 comments on commit 509da20

Please sign in to comment.