Skip to content

chore: bump module to Go 1.24 #426

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.

Sign up for GitHub

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

Merged
tri-adam merged 1 commit into from
Aug 14, 2025
Merged

chore: bump module to Go 1.24 #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ executors:
- image: golangci/golangci-lint:v2.2
golang-previous:
docker:
- image: golang:1.23
- image: golang:1.24
golang-latest:
docker:
- image: golang:1.24
- image: golang:1.25

jobs:
lint-markdown:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/sylabs/sif/v2

go 1.23.0
go 1.24.0

require (
github.com/ProtonMail/go-crypto v1.3.0
Expand Down
11 changes: 5 additions & 6 deletions pkg/integrity/clearsign_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved.
// Copyright (c) 2020-2025, Sylabs Inc. All rights reserved.
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
// distributed with the sources of this project regarding your rights to use or distribute this
// software.
Expand All @@ -8,7 +8,6 @@ package integrity
import (
"bufio"
"bytes"
"context"
"crypto"
"errors"
"io"
Expand Down Expand Up @@ -54,7 +53,7 @@ func Test_clearsignEncoder_signMessage(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
b := bytes.Buffer{}

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

var vr VerifyResult
b, err := tt.de.verifyMessage(context.Background(), bytes.NewReader(b.Bytes()), ht, &vr)
b, err := tt.de.verifyMessage(t.Context(), bytes.NewReader(b.Bytes()), ht, &vr)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -180,7 +179,7 @@ func Test_clearsignDecoder_verifyMessage(t *testing.T) {
Time: fixedTime,
},
}
h, err := en.signMessage(context.Background(), &b, strings.NewReader(testMessage))
h, err := en.signMessage(t.Context(), &b, strings.NewReader(testMessage))
if err != nil {
t.Fatal(err)
}
Expand All @@ -196,7 +195,7 @@ func Test_clearsignDecoder_verifyMessage(t *testing.T) {

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

if got, want := err, tt.wantErr; !errors.Is(got, want) {
t.Fatalf("got error %v, want %v", got, want)
Expand Down
9 changes: 4 additions & 5 deletions pkg/integrity/dsse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022-2024, Sylabs Inc. All rights reserved.
// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
// distributed with the sources of this project regarding your rights to use or distribute this
// software.
Expand All @@ -7,7 +7,6 @@ package integrity

import (
"bytes"
"context"
"crypto"
"encoding/base64"
"encoding/json"
Expand Down Expand Up @@ -83,7 +82,7 @@ func Test_dsseEncoder_signMessage(t *testing.T) {

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

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

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

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

if got, want := err, tt.wantErr; !errors.Is(got, want) {
t.Errorf("got error %v, want %v", got, want)
Expand Down
5 changes: 2 additions & 3 deletions pkg/integrity/sign_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved.
// Copyright (c) 2020-2025, Sylabs Inc. All rights reserved.
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
// distributed with the sources of this project regarding your rights to use or distribute this
// software.
Expand All @@ -7,7 +7,6 @@ package integrity

import (
"bytes"
"context"
"crypto"
"errors"
"os"
Expand Down Expand Up @@ -339,7 +338,7 @@ func TestGroupSigner_Sign(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
di, err := tt.gs.sign(context.Background())
di, err := tt.gs.sign(t.Context())
if (err != nil) != tt.wantErr {
t.Fatalf("got error %v, want %v", err, tt.wantErr)
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/integrity/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved.
// Copyright (c) 2020-2025, Sylabs Inc. All rights reserved.
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
// distributed with the sources of this project regarding your rights to use or distribute this
// software.
Expand Down Expand Up @@ -161,7 +161,7 @@ func TestGroupVerifier_verify(t *testing.T) {
}

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

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

var vr VerifyResult
err = v.verifySignature(context.Background(), tt.sig, tt.de, &vr)
err = v.verifySignature(t.Context(), tt.sig, tt.de, &vr)

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

var vr VerifyResult
err = v.verifySignature(context.Background(), tt.sig, tt.de, &vr)
err = v.verifySignature(t.Context(), tt.sig, tt.de, &vr)

if got, want := err, tt.wantErr; !errors.Is(got, want) {
t.Errorf("got error %v, want %v", got, want)
Expand Down
5 changes: 2 additions & 3 deletions pkg/user/unmount_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package user

import (
"bufio"
"context"
"errors"
"fmt"
"os"
Expand Down Expand Up @@ -74,13 +73,13 @@ func Test_Unmount(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if tt.mountSIF != "" {
err := Mount(context.Background(), tt.mountSIF, tt.mountPath)
err := Mount(t.Context(), tt.mountSIF, tt.mountPath)
if err != nil {
t.Fatal(err)
}
}

err := Unmount(context.Background(), tt.mountPath, tt.opts...)
err := Unmount(t.Context(), tt.mountPath, tt.opts...)

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