Skip to content

Commit facfa98

Browse files
committed
chore: bump module to Go 1.24
1 parent 21f6359 commit facfa98

File tree

7 files changed

+20
-24
lines changed

7 files changed

+20
-24
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ executors:
1212
- image: golangci/golangci-lint:v2.0
1313
golang-previous:
1414
docker:
15-
- image: golang:1.23
15+
- image: golang:1.24
1616
golang-latest:
1717
docker:
18-
- image: golang:1.24
18+
- image: golang:1.25-rc
1919

2020
jobs:
2121
lint-markdown:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/sylabs/sif/v2
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
github.com/ProtonMail/go-crypto v1.3.0

pkg/integrity/clearsign_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved.
1+
// Copyright (c) 2020-2025, Sylabs Inc. All rights reserved.
22
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
33
// distributed with the sources of this project regarding your rights to use or distribute this
44
// software.
@@ -8,7 +8,6 @@ package integrity
88
import (
99
"bufio"
1010
"bytes"
11-
"context"
1211
"crypto"
1312
"errors"
1413
"io"
@@ -54,7 +53,7 @@ func Test_clearsignEncoder_signMessage(t *testing.T) {
5453
t.Run(tt.name, func(t *testing.T) {
5554
b := bytes.Buffer{}
5655

57-
ht, err := tt.en.signMessage(context.Background(), &b, strings.NewReader(testMessage))
56+
ht, err := tt.en.signMessage(t.Context(), &b, strings.NewReader(testMessage))
5857
if got, want := err, tt.wantErr; (got != nil) != want {
5958
t.Fatalf("got error %v, wantErr %v", got, want)
6059
}
@@ -65,7 +64,7 @@ func Test_clearsignEncoder_signMessage(t *testing.T) {
6564
}
6665

6766
var vr VerifyResult
68-
b, err := tt.de.verifyMessage(context.Background(), bytes.NewReader(b.Bytes()), ht, &vr)
67+
b, err := tt.de.verifyMessage(t.Context(), bytes.NewReader(b.Bytes()), ht, &vr)
6968
if err != nil {
7069
t.Fatal(err)
7170
}
@@ -180,7 +179,7 @@ func Test_clearsignDecoder_verifyMessage(t *testing.T) {
180179
Time: fixedTime,
181180
},
182181
}
183-
h, err := en.signMessage(context.Background(), &b, strings.NewReader(testMessage))
182+
h, err := en.signMessage(t.Context(), &b, strings.NewReader(testMessage))
184183
if err != nil {
185184
t.Fatal(err)
186185
}
@@ -196,7 +195,7 @@ func Test_clearsignDecoder_verifyMessage(t *testing.T) {
196195

197196
// Decode and verify message.
198197
var vr VerifyResult
199-
message, err := tt.de.verifyMessage(context.Background(), bytes.NewReader(b.Bytes()), h, &vr)
198+
message, err := tt.de.verifyMessage(t.Context(), bytes.NewReader(b.Bytes()), h, &vr)
200199

201200
if got, want := err, tt.wantErr; !errors.Is(got, want) {
202201
t.Fatalf("got error %v, want %v", got, want)

pkg/integrity/dsse_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022-2024, Sylabs Inc. All rights reserved.
1+
// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
22
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
33
// distributed with the sources of this project regarding your rights to use or distribute this
44
// software.
@@ -7,7 +7,6 @@ package integrity
77

88
import (
99
"bytes"
10-
"context"
1110
"crypto"
1211
"encoding/base64"
1312
"encoding/json"
@@ -83,7 +82,7 @@ func Test_dsseEncoder_signMessage(t *testing.T) {
8382

8483
en := newDSSEEncoder(tt.signers, tt.signOpts...)
8584

86-
ht, err := en.signMessage(context.Background(), &b, strings.NewReader(testMessage))
85+
ht, err := en.signMessage(t.Context(), &b, strings.NewReader(testMessage))
8786
if got, want := err, tt.wantErr; (got != nil) != want {
8887
t.Fatalf("got error %v, wantErr %v", got, want)
8988
}
@@ -321,7 +320,7 @@ func Test_dsseDecoder_verifyMessage(t *testing.T) {
321320
en := newDSSEEncoder(tt.signers, tt.signOpts...)
322321

323322
// Sign and encode message.
324-
h, err := en.signMessage(context.Background(), &b, strings.NewReader(testMessage))
323+
h, err := en.signMessage(t.Context(), &b, strings.NewReader(testMessage))
325324
if err != nil {
326325
t.Fatal(err)
327326
}
@@ -343,7 +342,7 @@ func Test_dsseDecoder_verifyMessage(t *testing.T) {
343342

344343
// Decode and verify message.
345344
var vr VerifyResult
346-
message, err := tt.de.verifyMessage(context.Background(), bytes.NewReader(b.Bytes()), h, &vr)
345+
message, err := tt.de.verifyMessage(t.Context(), bytes.NewReader(b.Bytes()), h, &vr)
347346

348347
if got, want := err, tt.wantErr; !errors.Is(got, want) {
349348
t.Errorf("got error %v, want %v", got, want)

pkg/integrity/sign_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved.
1+
// Copyright (c) 2020-2025, Sylabs Inc. All rights reserved.
22
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
33
// distributed with the sources of this project regarding your rights to use or distribute this
44
// software.
@@ -7,7 +7,6 @@ package integrity
77

88
import (
99
"bytes"
10-
"context"
1110
"crypto"
1211
"errors"
1312
"os"
@@ -339,7 +338,7 @@ func TestGroupSigner_Sign(t *testing.T) {
339338

340339
for _, tt := range tests {
341340
t.Run(tt.name, func(t *testing.T) {
342-
di, err := tt.gs.sign(context.Background())
341+
di, err := tt.gs.sign(t.Context())
343342
if (err != nil) != tt.wantErr {
344343
t.Fatalf("got error %v, want %v", err, tt.wantErr)
345344
}

pkg/integrity/verify_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved.
1+
// Copyright (c) 2020-2025, Sylabs Inc. All rights reserved.
22
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
33
// distributed with the sources of this project regarding your rights to use or distribute this
44
// software.
@@ -161,7 +161,7 @@ func TestGroupVerifier_verify(t *testing.T) {
161161
}
162162

163163
var vr VerifyResult
164-
err := v.verifySignature(context.Background(), tt.sig, tt.de, &vr)
164+
err := v.verifySignature(t.Context(), tt.sig, tt.de, &vr)
165165

166166
if got, want := err, tt.wantErr; !errors.Is(got, want) {
167167
t.Errorf("got error %v, want %v", got, want)
@@ -289,7 +289,7 @@ func TestLegacyGroupVerifier_verify(t *testing.T) {
289289
}
290290

291291
var vr VerifyResult
292-
err = v.verifySignature(context.Background(), tt.sig, tt.de, &vr)
292+
err = v.verifySignature(t.Context(), tt.sig, tt.de, &vr)
293293

294294
if got, want := err, tt.wantErr; !errors.Is(got, want) {
295295
t.Errorf("got error %v, want %v", got, want)
@@ -427,7 +427,7 @@ func TestLegacyObjectVerifier_verify(t *testing.T) {
427427
}
428428

429429
var vr VerifyResult
430-
err = v.verifySignature(context.Background(), tt.sig, tt.de, &vr)
430+
err = v.verifySignature(t.Context(), tt.sig, tt.de, &vr)
431431

432432
if got, want := err, tt.wantErr; !errors.Is(got, want) {
433433
t.Errorf("got error %v, want %v", got, want)

pkg/user/unmount_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package user
77

88
import (
99
"bufio"
10-
"context"
1110
"errors"
1211
"fmt"
1312
"os"
@@ -74,13 +73,13 @@ func Test_Unmount(t *testing.T) {
7473
for _, tt := range tests {
7574
t.Run(tt.name, func(t *testing.T) {
7675
if tt.mountSIF != "" {
77-
err := Mount(context.Background(), tt.mountSIF, tt.mountPath)
76+
err := Mount(t.Context(), tt.mountSIF, tt.mountPath)
7877
if err != nil {
7978
t.Fatal(err)
8079
}
8180
}
8281

83-
err := Unmount(context.Background(), tt.mountPath, tt.opts...)
82+
err := Unmount(t.Context(), tt.mountPath, tt.opts...)
8483

8584
if err != nil && !tt.wantErr {
8685
t.Errorf("Unexpected error: %s", err)

0 commit comments

Comments
 (0)