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

update dependencies, use go 1.22 including workaround for https://github.com/golang/go/issues/64520 #415

Merged
merged 6 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -66,6 +66,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
18 changes: 9 additions & 9 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
test:
strategy:
matrix:
go-version: [1.19.x, 1.21.x]
go-version: [1.19.x, 1.22.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
cache: true
Expand All @@ -38,12 +38,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
cache: true

- name: Install openssl
Expand All @@ -60,12 +60,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
cache: true

- name: Lint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
test:
strategy:
matrix:
go-version: [1.18.x, 1.20.x]
go-version: [1.18.x, 1.22.x]
# add macos-12 when runners are available on github.
os: [macos-11]
runs-on: ${{ matrix.os }}
steps:
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/term v0.15.0
golang.org/x/text v0.14.0
v.io/x/lib v0.1.17
v.io/x/lib v0.1.19
v.io/x/ref/internal/logger v0.1.1
v.io/x/ref/lib/flags/sitedefaults v0.1.1
v.io/x/ref/test/compatibility/modules/simple v0.0.0-20220116222041-f948f3a44e0d
Expand Down
18 changes: 9 additions & 9 deletions v23/flow/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import "v.io/v23/verror"
// These were previously defined in errors.vdl using the ID values
// below rather than the more conventional Err<Name>.
var (
ErrAuth = verror.NewID("Auth")
ErrNotTrusted = verror.NewID("NotTrusted")
ErrNetwork = verror.NewID("Network")
ErrDialFailed = verror.NewID("DialFailed")
ErrResolveFailed = verror.NewID("ResolveFailed")
ErrProxy = verror.NewID("Proxy")
ErrBadArg = verror.NewID("BadArg")
ErrBadState = verror.NewID("BadState")
ErrAborted = verror.NewID("Aborted")
ErrAuth = verror.NewID("v.io/v23/flow.Auth")
ErrNotTrusted = verror.NewID("v.io/v23/flow.NotTrusted")
ErrNetwork = verror.NewID("v.io/v23/flow.Network")
ErrDialFailed = verror.NewID("v.io/v23/flow.DialFailed")
ErrResolveFailed = verror.NewID("v.io/v23/flow.ResolveFailed")
ErrProxy = verror.NewID("v.io/v23/flow.Proxy")
ErrBadArg = verror.NewID("v.io/v23/flow.BadArg")
ErrBadState = verror.NewID("v.io/v23/flow.BadState")
ErrAborted = verror.NewID("v.io/v23/flow.Aborted")
)
8 changes: 4 additions & 4 deletions v23/flow/message/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
)

var (
ErrInvalidMsg = verror.NewID("InvalidMsg")
ErrInvalidSetupOption = verror.NewID("InvalidSetupOption")
ErrUnknownMsg = verror.NewID("UnknownMsg")
ErrMissingBlessings = verror.NewID("MissingBlessings")
ErrInvalidMsg = verror.NewID("v.io/v23/flow/messages.InvalidMsg")
ErrInvalidSetupOption = verror.NewID("v.io/v23/flow/messages.InvalidSetupOption")
ErrUnknownMsg = verror.NewID("v.io/v23/flow/messages.UnknownMsg")
ErrMissingBlessings = verror.NewID("v.io/v23/flow/messages.MissingBlessings")
)

// NewErrInvalidMsg creates an instance ErrInvalidMsg with the specified parameters which can be
Expand Down
10 changes: 5 additions & 5 deletions v23/naming/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ const (
)

var (
ErrNameExists = verror.NewID("nameExists")
ErrNoSuchName = verror.NewID("nameDoesntExist")
ErrNoSuchNameRoot = verror.NewID("rootNameDoesntExist")
ErrResolutionDepthExceeded = verror.NewID("resolutionDepthExceeded")
ErrNoMountTable = verror.NewID("noMounttable")
ErrNameExists = verror.NewID("v.io/v23/naming.nameExists")
ErrNoSuchName = verror.NewID("v.io/v23/naming.nameDoesntExist")
ErrNoSuchNameRoot = verror.NewID("v.io/v23/naming.rootNameDoesntExist")
ErrResolutionDepthExceeded = verror.NewID("v.io/v23/naming.resolutionDepthExceeded")
ErrNoMountTable = verror.NewID("v.io/v23/naming.noMounttable")
)

// Names returns the servers represented by MountEntry as names, including
Expand Down
6 changes: 5 additions & 1 deletion v23/verror/pkgpath.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,12 @@ func ensurePackagePath(id ID) ID {
if strings.Contains(sid, ".") && sid[0] != '.' {
return id
}
_, file, _, _ := runtime.Caller(2)
_, file, _, ok := runtime.Caller(2)
pkg := pkgPathCache.pkgPath(file)
if ok && file == "<autogenerated>" {
// See https://github.com/golang/go/issues/64520
panic("verror.NewID was called to initialize a global variable, specify the full package path in the ID or move the call to NewID to an init function\nNOTE that the stack trace shown below is not useful since its incorrect contents are the cause of the problem, see https://github.com/golang/go/issues/64520")
}
if len(pkg) == 0 {
return id
}
Expand Down
8 changes: 6 additions & 2 deletions v23/vom/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ import (
)

var (
errDumperClosed = verror.NewID("errDumperClosed")
errDumperFlushed = verror.NewID("errDumperFlushed")
errDumperClosed, errDumperFlushed verror.IDAction
)

func init() {
errDumperClosed = verror.NewID("errDumperClosed")
errDumperFlushed = verror.NewID("errDumperFlushed")
}

// Dump returns a human-readable dump of the given vom data, in the default
// string format.
func Dump(data []byte) (string, error) {
Expand Down
26 changes: 13 additions & 13 deletions x/ref/aws/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ require (

require (
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/aws/aws-sdk-go v1.50.6 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/aws/aws-sdk-go v1.50.38 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.17.5 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.51.0 // indirect
github.com/valyala/fasthttp v1.52.0 // indirect
github.com/vanadium/go-mdns-sd v0.0.0-20230219002252-724533cf06f5 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
v.io/x/lib v0.1.18 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
v.io/x/lib v0.1.19 // indirect
v.io/x/ref/internal/logger v0.1.1 // indirect
v.io/x/ref/lib/flags/sitedefaults v0.1.1 // indirect
)
Loading
Loading