Skip to content

chore: bump module Go version to 1.20 #317

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 9, 2023
Merged

chore: bump module Go version to 1.20 #317

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
11 changes: 4 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,11 @@ executors:
docker:
- image: golangci/golangci-lint:v1.53
golang-previous:
docker:
- image: golang:1.19
golang-latest:
docker:
- image: golang:1.20
golang-rc:
golang-latest:
docker:
- image: golang:1.21-rc
- image: golang:1.21

jobs:
lint-markdown:
Expand Down Expand Up @@ -135,11 +132,11 @@ workflows:
- build-source:
matrix:
parameters:
e: ["golang-previous", "golang-latest","golang-rc"]
e: ["golang-previous", "golang-latest"]
- unit-test:
matrix:
parameters:
e: ["golang-previous", "golang-latest","golang-rc"]
e: ["golang-previous", "golang-latest"]
- release-test

tagged-release:
Expand Down
4 changes: 0 additions & 4 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,5 @@ linters:
- whitespace

linters-settings:
errorlint:
# Go 1.19 compatibility (https://github.com/sylabs/sif/issues/265).
errorf-multi: false

misspell:
locale: US
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.19
go 1.20

require (
github.com/ProtonMail/go-crypto v0.0.0-20230710112148-e01326fd72eb
Expand Down
4 changes: 2 additions & 2 deletions pkg/integrity/digest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (d digest) MarshalJSON() ([]byte, error) {
func (d *digest) UnmarshalJSON(data []byte) error {
var s string
if err := json.Unmarshal(data, &s); err != nil {
return fmt.Errorf("%w: %v", errDigestMalformed, err)
return fmt.Errorf("%w: %w", errDigestMalformed, err)
}

parts := strings.Split(s, ":")
Expand All @@ -129,7 +129,7 @@ func (d *digest) UnmarshalJSON(data []byte) error {

v, err := hex.DecodeString(value)
if err != nil {
return fmt.Errorf("%w: %v", errDigestMalformed, err)
return fmt.Errorf("%w: %w", errDigestMalformed, err)
}

for h, n := range supportedDigestAlgorithms {
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/dsse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (de *dsseDecoder) verifyMessage(ctx context.Context, r io.Reader, h crypto.

vr.aks, err = v.Verify(ctx, &e)
if err != nil {
return nil, fmt.Errorf("%w: %v", errDSSEVerifyEnvelopeFailed, err)
return nil, fmt.Errorf("%w: %w", errDSSEVerifyEnvelopeFailed, err)
}

if e.PayloadType != de.payloadType {
Expand Down