Update Go version and workflows

openziti · Sep 6, 2024 · 9a3506d · 9a3506d
1 parent 3baddd7
commit 9a3506d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,3 +5,23 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    non-major:
+      applies-to: version-updates
+      update-types:
+        - "minor"
+        - "patch"
+
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+  groups:
+    all:
+      applies-to: version-updates
+      update-types:
+        - "major"
+        - "minor"
+        - "patch"
+
diff --git a/.github/workflows/golangci-link.yml → .github/workflows/golangci-lint.yml b/.github/workflows/golangci-link.yml → .github/workflows/golangci-lint.yml
@@ -11,15 +11,18 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.19
-      - uses: actions/checkout@v3
+          go-version-file: ./go.mod
+
+
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.49
+          version: v1.57.2
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.19.x'
+          go-version-file: ./go.mod
 
       - name: install libsodium (for compat tests)
         run: sudo apt install libsodium-dev
@@ -36,7 +36,7 @@ jobs:
           gh_ci_key: ${{ secrets.GH_CI_KEY }}
           ziti_ci_gpg_key: ${{ secrets.ZITI_CI_GPG_KEY }}
           ziti_ci_gpg_key_id: ${{ secrets.ZITI_CI_GPG_KEY_ID }}
-        if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-')
+        if: github.ref_name == 'main' || startsWith(github.ref_name, 'release-')
         run: |
           $(go env GOPATH)/bin/ziti-ci configure-git
           $(go env GOPATH)/bin/ziti-ci tag -v -f version

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openziti/secretstream
 
-go 1.19
+go 1.22
 
 require golang.org/x/crypto v0.24.0