From ff60735b353f23180646a837058333927038e749 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Mon, 25 Mar 2024 16:01:37 -0400 Subject: [PATCH] Update Go version to 1.22.x --- .github/dependabot.yml | 10 +++++----- .github/workflows/fablab-db-creation.yml | 2 +- .github/workflows/golangci-lint.yml | 4 ++-- .github/workflows/main.yml | 14 +++++++------- .github/workflows/update-dependency.yml | 2 +- .golangci.yml | 6 +++--- CHANGELOG.md | 7 +++++++ go.mod | 2 +- zititest/go.mod | 2 +- 9 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7431f3fe6..051529104 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,7 +12,7 @@ updates: - "minor" - "patch" patterns: - - "openziti" + - "*openziti*" third-party: applies-to: version-updates @@ -20,10 +20,10 @@ updates: - "minor" - "patch" exclude-patterns: - - "openziti" - - "rabbitmq" - - "blackfriday" - - "zitadel" + - "*openziti*" + - "*rabbitmq*" + - "*blackfriday*" + - "*zitadel*" - package-ecosystem: github-actions directory: "/" diff --git a/.github/workflows/fablab-db-creation.yml b/.github/workflows/fablab-db-creation.yml index 4f95364a2..1aa1ab31d 100644 --- a/.github/workflows/fablab-db-creation.yml +++ b/.github/workflows/fablab-db-creation.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Ziti CI uses: openziti/ziti-ci@v1 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 34dc0fc90..7ad5be397 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - uses: actions/checkout@v4 @@ -27,7 +27,7 @@ jobs: uses: golangci/golangci-lint-action@v4 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.55.2 + version: latest # Optional: working directory, useful for monorepos # working-directory: somedir diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b02fb5f1..e55969948 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -80,7 +80,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -111,7 +111,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -147,7 +147,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -178,7 +178,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -301,7 +301,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -416,7 +416,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Python uses: actions/setup-python@v5 diff --git a/.github/workflows/update-dependency.yml b/.github/workflows/update-dependency.yml index e7218f65d..8c351d5e0 100644 --- a/.github/workflows/update-dependency.yml +++ b/.github/workflows/update-dependency.yml @@ -21,7 +21,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version: '1.22.x' - name: Install Ziti CI uses: openziti/ziti-ci@v1 diff --git a/.golangci.yml b/.golangci.yml index e27f49a58..213c3aebb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,12 +1,12 @@ run: build-tags: - apitests - deadline: 8m - skip-files: - - ziti/cmd/edge/verify_ca.go + deadline: 10m # golangci gives false positives for implementations of methods using generics in generic interfaces issues: + exclude-files: + - ziti/cmd/edge/verify_ca.go exclude-rules: - path: 'controller/model/.*.go' linters: diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c612182..b12e8338e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Release 0.34.1 + +## What's New + +* Updates version of go to 1.22.x + * As usual when updating the go version, this is the only change in this release + # Release 0.34.0 ## What's New diff --git a/go.mod b/go.mod index 3c6d55450..e17d8bff2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openziti/ziti -go 1.21 +go 1.22 require ( github.com/AppsFlyer/go-sundheit v0.5.0 diff --git a/zititest/go.mod b/zititest/go.mod index ec19d3fe1..a0ab939b6 100644 --- a/zititest/go.mod +++ b/zititest/go.mod @@ -1,6 +1,6 @@ module github.com/openziti/ziti/zititest -go 1.21 +go 1.22 replace github.com/openziti/ziti => ../