From e325923863f52ce9244c40e2d7569f8a1af316e8 Mon Sep 17 00:00:00 2001
From: Adam Hughes <9903835+tri-adam@users.noreply.github.com>
Date: Tue, 28 May 2024 19:22:46 +0000
Subject: [PATCH 1/2] ci: bump golangci-lint to v1.59

Also update linter config to reflect name change of linter goerr113 to
err113.
---
 .circleci/config.yml             | 2 +-
 .golangci.yml                    | 2 +-
 pkg/sif/descriptor_input_test.go | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 212e81b1..a61e7b0e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,7 @@ executors:
       - image: node:20-slim
   golangci-lint:
     docker:
-      - image: golangci/golangci-lint:v1.57
+      - image: golangci/golangci-lint:v1.59
   golang-previous:
     docker:
       - image: golang:1.21
diff --git a/.golangci.yml b/.golangci.yml
index 4e9ba72a..2bd5d96c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -11,6 +11,7 @@ linters:
     - dogsled
     - dupl
     - dupword
+    - err113
     - errcheck
     - errchkjson
     - errname
@@ -21,7 +22,6 @@ linters:
     - gocritic
     - godot
     - godox
-    - goerr113
     - gofumpt
     - goimports
     - gomodguard
diff --git a/pkg/sif/descriptor_input_test.go b/pkg/sif/descriptor_input_test.go
index 5ac919b2..18fe18b0 100644
--- a/pkg/sif/descriptor_input_test.go
+++ b/pkg/sif/descriptor_input_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023, Sylabs Inc. All rights reserved.
+// Copyright (c) 2021-2024, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -195,8 +195,6 @@ func TestNewDescriptorInput(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
-
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

From f63936f6f43df391ed58800b2213b2b037a6f342 Mon Sep 17 00:00:00 2001
From: Adam Hughes <9903835+tri-adam@users.noreply.github.com>
Date: Tue, 28 May 2024 19:29:34 +0000
Subject: [PATCH 2/2] ci: bump node to v22

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a61e7b0e..8511f921 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 executors:
   node:
     docker:
-      - image: node:20-slim
+      - image: node:22-slim
   golangci-lint:
     docker:
       - image: golangci/golangci-lint:v1.59