Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Bump golang to 1.17.9/Mac M1 Support #3919

Merged
merged 6 commits into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ commands:
shell: bash.exe
command: |
choco install -y msys2 pacman make wget --force
choco install -y golang --version=1.16.15 --force
choco install -y golang --version=1.17.9 --force
choco install -y python3 --version=3.7.3 --force
export msys2='cmd //C RefreshEnv.cmd '
export msys2+='& set MSYS=winsymlinks:nativestrict '
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install golang
uses: actions/setup-go@v2
with:
go-version: '1.16.15'
go-version: '1.17.9'
- name: Build Test
run: |
export ALGORAND_DEADLOCK=enable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reviewdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Install specific golang
uses: actions/setup-go@v2
with:
go-version: '1.16.15'
go-version: '1.17.9'
- name: Create folders for golangci-lint
run: mkdir -p cicdtmp/golangci-lint
- name: Check if custom golangci-lint is already built
Expand Down
1 change: 1 addition & 0 deletions agreement/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/partitiontest_linter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/algorand/go-algorand/cmd/partitiontest_linter

go 1.16
go 1.17

require golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
require golang.org/x/sys v0.0.0-20210510120138-977fb7262007
Expand Down
1 change: 1 addition & 0 deletions compactcert/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crypto/compactcert/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crypto/merklearray/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crypto/merklesignature/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crypto/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crypto/secp256k1/dummy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build dummy
// +build dummy

// This file is part of a workaround for `go mod vendor` which won't vendor
Expand Down
1 change: 1 addition & 0 deletions crypto/secp256k1/libsecp256k1/contrib/dummy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build dummy
// +build dummy

// Package c contains only a C file.
Expand Down
1 change: 1 addition & 0 deletions crypto/secp256k1/libsecp256k1/dummy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build dummy
// +build dummy

// Package c contains only a C file.
Expand Down
1 change: 1 addition & 0 deletions crypto/secp256k1/libsecp256k1/include/dummy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build dummy
// +build dummy

// Package c contains only a C file.
Expand Down
1 change: 1 addition & 0 deletions crypto/secp256k1/libsecp256k1/src/dummy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build dummy
// +build dummy

// Package c contains only a C file.
Expand Down
1 change: 1 addition & 0 deletions crypto/secp256k1/libsecp256k1/src/modules/dummy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build dummy
// +build dummy

// Package c contains only a C file.
Expand Down
1 change: 1 addition & 0 deletions crypto/secp256k1/libsecp256k1/src/modules/ecdh/dummy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build dummy
// +build dummy

// Package c contains only a C file.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build dummy
// +build dummy

// Package c contains only a C file.
Expand Down
4 changes: 2 additions & 2 deletions crypto/secp256k1/panic_cb.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be found in
// the LICENSE file.

// +build !gofuzz
// +build cgo
//go:build !gofuzz && cgo
// +build !gofuzz,cgo

package secp256k1

Expand Down
4 changes: 2 additions & 2 deletions crypto/secp256k1/scalar_mult_cgo.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be found in
// the LICENSE file.

// +build !gofuzz
// +build cgo
//go:build !gofuzz && cgo
// +build !gofuzz,cgo

package secp256k1

Expand Down
1 change: 1 addition & 0 deletions crypto/secp256k1/scalar_mult_nocgo.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be found in
// the LICENSE file.

//go:build gofuzz || !cgo
// +build gofuzz !cgo

package secp256k1
Expand Down
4 changes: 2 additions & 2 deletions crypto/secp256k1/secp256.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be found in
// the LICENSE file.

// +build !gofuzz
// +build cgo
//go:build !gofuzz && cgo
// +build !gofuzz,cgo

// Package secp256k1 wraps the bitcoin secp256k1 C library.
package secp256k1
Expand Down
1 change: 1 addition & 0 deletions daemon/algod/api/spec/v2/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions data/account/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions data/basics/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions data/bookkeeping/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions data/committee/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions data/hashable/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions data/transactions/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/algorand/go-algorand

go 1.16
go 1.17

require (
github.com/algorand/falcon v0.0.0-20220130164023-c9e1d466f123
Expand All @@ -14,12 +14,15 @@ require (
github.com/aws/aws-sdk-go v1.16.5
github.com/chrismcguire/gobberish v0.0.0-20150821175641-1d8adb509a0e
github.com/cpuguy83/go-md2man v1.0.8 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Eric-Warehime marked this conversation as resolved.
Show resolved Hide resolved
github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018
github.com/dchest/siphash v1.2.1
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/fatih/color v1.7.0
github.com/fortytw2/leaktest v1.3.0 // indirect
github.com/gen2brain/beeep v0.0.0-20180718162406-4e430518395f
github.com/getkin/kin-openapi v0.22.0
github.com/ghodss/yaml v1.0.0 // indirect
github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f // indirect
github.com/gofrs/flock v0.7.0
github.com/google/go-querystring v1.0.0
Expand All @@ -28,26 +31,39 @@ require (
github.com/gorilla/context v1.1.1 // indirect
github.com/gorilla/mux v1.6.2
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
github.com/jmoiron/sqlx v1.2.0
github.com/josharian/intern v1.0.0 // indirect
github.com/karalabe/usb v0.0.2
github.com/labstack/echo/v4 v4.1.17
github.com/labstack/gommon v0.3.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-sqlite3 v1.10.0
github.com/miekg/dns v1.1.27
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
github.com/olivere/elastic v6.2.14+incompatible
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.7.1
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.1 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.7
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/sohlich/elogrus.v3 v3.0.0-20180410122755-1fa29e2f2009
gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
)
1 change: 1 addition & 0 deletions ledger/ledgercore/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ledger/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions libgoal/lockedFileLinux.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build linux
// +build linux

package libgoal
Expand Down
1 change: 1 addition & 0 deletions libgoal/lockedFileUnix.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// Support all unix system except linux
// in https://github.com/golang/sys/blob/master/unix/syscall_unix.go

//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris
// +build aix darwin dragonfly freebsd netbsd openbsd solaris

package libgoal
Expand Down
1 change: 1 addition & 0 deletions libgoal/lockedFileWindows.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build windows
// +build windows

package libgoal
Expand Down
1 change: 1 addition & 0 deletions network/messagetracer/graphtrace.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.
//
//go:build msgtrace
// +build msgtrace

package messagetracer
Expand Down
1 change: 1 addition & 0 deletions node/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions nodecontrol/kmdControl_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build !windows
// +build !windows

package nodecontrol
Expand Down
1 change: 1 addition & 0 deletions protocol/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions protocol/test/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions rpcs/msgp_gen_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/buildtools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/algorand/go-algorand/scripts/buildtools

go 1.16
go 1.17

require (
github.com/algorand/msgp v1.1.50
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is where you'll update msgp after your other PR is merged and tagged

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Eric-Warehime please update the version and I'll merge this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated. Also had to run go get and go mod tidy which ended up separating deps into separate require blocks. See https://go-review.googlesource.com/c/go/+/325922/ and golang/go#45965 for details.

Expand Down
6 changes: 3 additions & 3 deletions scripts/get_golang_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
# Our build task-runner `mule` will refer to this script and will automatically
# build a new image whenever the version number has been changed.

BUILD=1.16.15
MIN=1.16
GO_MOD_SUPPORT=1.16
BUILD=1.17.9
MIN=1.17
GO_MOD_SUPPORT=1.17

if [ "$1" = all ]
then
Expand Down
1 change: 1 addition & 0 deletions tools/network/dnssec/config_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build !windows
// +build !windows

package dnssec
Expand Down
1 change: 1 addition & 0 deletions tools/network/dnssec/config_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build !windows
// +build !windows

package dnssec
Expand Down
1 change: 1 addition & 0 deletions tools/network/dnssec/config_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build windows
// +build windows

package dnssec
Expand Down
1 change: 1 addition & 0 deletions util/process_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build !windows
// +build !windows

package util
Expand Down
1 change: 1 addition & 0 deletions util/process_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build windows
// +build windows

package util
Expand Down
1 change: 1 addition & 0 deletions util/sleep.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build !linux
// +build !linux

package util
Expand Down
1 change: 1 addition & 0 deletions util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with go-algorand. If not, see <https://www.gnu.org/licenses/>.

//go:build !windows
// +build !windows

package util
Expand Down