Merge pull request #595 from 1Password/scoot/fix/ci-node-version-bump

Update workflows to fix node 20 deprecation and update golangci-lint-action version and config

Author: scottisloud

.github/workflows/check-flake.yml

@@ -2,7 +2,7 @@ name: Check Nix flake
 on:
   pull_request:
     paths:
-      - '**.nix'
+      - "**.nix"
       - flake.lock
   push:
     branches:
@@ -11,9 +11,9 @@ jobs:
   check-flake:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@v22
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
       - name: Check Nix flake inputs
         uses: DeterminateSystems/flake-checker-action@v5
         with:

.github/workflows/test.yaml

@@ -2,26 +2,26 @@ name: Test and Validate
 on:
   push:
     paths-ignore:
-      - '**.md'
-      - '.github/ISSUE_TEMPLATE/**'
+      - "**.md"
+      - ".github/ISSUE_TEMPLATE/**"
   pull_request:
     paths-ignore:
-      - '**.md'
-      - '.github/ISSUE_TEMPLATE/**'
+      - "**.md"
+      - ".github/ISSUE_TEMPLATE/**"
 
 jobs:
   build:
     name: Test
     runs-on: ubuntu-latest
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v6
+
       - name: Set up Go 1.x
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v6
         with:
           go-version: ^1.18
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-
       - name: Test
         run: make test
 
@@ -31,17 +31,17 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+
       - name: "Set up Go 1.x"
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v6
         with:
           go-version: 1.19
 
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Lint with golanci-lint
-        uses: golangci/golangci-lint-action@v3
+      - name: Lint with golangci-lint
+        uses: golangci/golangci-lint-action@v9
         with:
           # version of golangci-lint to use
           # Version should stay in sync with version used for local linting (lint job in Makefile).
-          version: v1.50.1
+          version: v2.12.2

.github/workflows/update-flake-dependencies.yml

@@ -2,15 +2,17 @@
 name: Update flake dependencies
 on:
   schedule:
-    - cron: '0 16 * * 5'
+    - cron: "0 16 * * 5"
   workflow_dispatch: # for allowing manual triggers of the workflow
 jobs:
   update-dependencies:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@v22
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
+        with:
+          use-flakehub: false
       - name: Update flake.lock and create signed commit with flake.lock changes
         env:
           GITHUB_TOKEN: ${{ secrets.OP_BOT_TOKEN }}
@@ -23,7 +25,7 @@ jobs:
           # if branch exists on remote already
           BRANCH_EXISTS=false
           if git checkout "$COMMIT_BRANCH" > /dev/null 2>&1; then
-            # pull changes
+            # pull changeshttps://github.com/1Password/shell-plugins/pull/595
             git pull
             BRANCH_EXISTS=true
           else

.golangci.yml

@@ -1,26 +1,29 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     # Defaults:
-    - errcheck
-    - gosimple
     - govet
     - ineffassign
-    - staticcheck
-    - typecheck
     - unused
     # Extra:
     - asciicheck
     - bidichk
+  disable:
+    # Scott L: currently these produce errors that need to be fixed in a seprate PR
+    - errcheck
     - depguard
-    - goimports
-    - gofmt
+    - staticcheck
+
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: math/rand
+              desc: "please use the safer crypto/rand"
 
-linters-settings:
-  depguard:
-    list-type: blacklist
-    include-go-root: false
-    packages:
-      - math/rand
-    packages-with-error-message:
-      - math/rand: "please use the safer crypto/rand"
+formatters:
+  enable:
+    - gofmt
+    - goimports

Makefile

@@ -44,7 +44,7 @@ test:
 
 lint:
 	# Version used should stay in sync with version in CI (.github/workflows/test.yaml).
-	docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.50.1 golangci-lint run
+	docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v2.12.2 golangci-lint run
 
 %/remove-local: beta-notice
 	$(eval plugin := $(firstword $(subst /, ,$@)))