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

chore(deps): bump go.einride.tech/sage from 0.298.0 to 0.306.0 in /.sage #96

Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Sage
uses: einride/sage/actions/setup@master
with:
go-version: '1.20'
go-version: '1.23.0'

- name: Make
run: make
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup Sage
uses: einride/sage/actions/setup@master
with:
go-version: '1.20'
go-version: '1.23.0'

- name: Make
run: make
Expand Down
4 changes: 2 additions & 2 deletions .sage/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module sage

go 1.20
go 1.23.0

require go.einride.tech/sage v0.298.0
require go.einride.tech/sage v0.308.1
4 changes: 2 additions & 2 deletions .sage/go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
go.einride.tech/sage v0.298.0 h1:XakQxXJeuP1B0pVX9ebSLIRSFmUryilDA9wX443YNeA=
go.einride.tech/sage v0.298.0/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ=
go.einride.tech/sage v0.308.1 h1:gjQ4C7O40H7ISkOILemf8Q8R6sm/9DUihfpZc5U/Uvw=
go.einride.tech/sage v0.308.1/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ=
2 changes: 1 addition & 1 deletion .sage/sagefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func GitVerifyNoDiff(ctx context.Context) error {

func Stringer(ctx context.Context) error {
sg.Logger(ctx).Println("building...")
_, err := sgtool.GoInstall(ctx, "golang.org/x/tools/cmd/stringer", "v0.10.0")
_, err := sgtool.GoInstall(ctx, "golang.org/x/tools/cmd/stringer", "v0.25.0")
return err
}

Expand Down
2 changes: 1 addition & 1 deletion commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -331,5 +331,5 @@ func (rt *Protocol) sendAndWaitForResponse(sender senderType, s string, expected
return nil
}
}
return fmt.Errorf("sendcommandandwaitforresponse: response " + p.CommandResponse)
return fmt.Errorf("sendcommandandwaitforresponse: response (%s)", p.CommandResponse)
}
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/mlveggo/qualisys-go

go 1.20
go 1.23.0

require gotest.tools v2.2.0+incompatible

Expand Down
8 changes: 4 additions & 4 deletions pkg/discover/discover.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ func (dr *Response) String() string {
}

type Discovery struct {
receivePort int
receivePort uint16
timeout time.Duration
}

func NewDiscovery(receivePort int, timeout time.Duration) *Discovery {
func NewDiscovery(receivePort uint16, timeout time.Duration) *Discovery {
return &Discovery{receivePort: receivePort, timeout: timeout}
}

Expand All @@ -117,7 +117,7 @@ func (d *Discovery) Discover() ([]Response, error) {
if err != nil {
return nil, err
}
conn, err := net.ListenPacket("udp", ":"+strconv.Itoa(d.receivePort))
conn, err := net.ListenPacket("udp", ":"+strconv.Itoa(int(d.receivePort)))
if err != nil {
return nil, err
}
Expand All @@ -129,7 +129,7 @@ func (d *Discovery) Discover() ([]Response, error) {
data := make([]byte, 10)
binary.LittleEndian.PutUint32(data, 10)
binary.LittleEndian.PutUint32(data[4:8], 7)
binary.BigEndian.PutUint16(data[8:10], uint16(d.receivePort))
binary.BigEndian.PutUint16(data[8:10], d.receivePort)
for _, ip := range ips {
ipp := net.JoinHostPort(ip, broadcastPort)
addr, err := net.ResolveUDPAddr("udp", ipp)
Expand Down
4 changes: 2 additions & 2 deletions protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (rt *Protocol) Connect() error {
}
const qtmConnectedResponse string = "QTM RT Interface connected"
if p.CommandResponse != qtmConnectedResponse {
return fmt.Errorf("connect: unexpected response " + p.CommandResponse)
return fmt.Errorf("connect: unexpected response (%s)", p.CommandResponse)
}
const (
majorVer = 1
Expand Down Expand Up @@ -149,7 +149,7 @@ func (rt *Protocol) Receive() (*Packet, error) {
return nil, fmt.Errorf("receive: unmarshalbinary %w", err)
}
if p.Type == PacketTypeError {
return &p, fmt.Errorf("receive: error packet returned " + p.ErrorResponse)
return &p, fmt.Errorf("receive: error packet returned (%s)", p.ErrorResponse)
}
return &p, nil
}