From 4b1893ad291b6130dadb381383f1cd7cd591d3dd Mon Sep 17 00:00:00 2001 From: David May <49894298+wass3rw3rk@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:05:05 -0500 Subject: [PATCH] chore: use go 1.23 and fix validate (#1188) --- .github/workflows/validate.yml | 55 ++++++++++++++++------------------ go.mod | 4 +-- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 8d9e58e02..6f0b721b6 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -12,36 +12,33 @@ jobs: runs-on: ubuntu-latest steps: - - name: clone - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: clone + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: install go - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 - with: - # use version from go.mod file - go-version-file: 'go.mod' - cache: true - check-latest: true + - name: install go + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 + with: + # use version from go.mod file + go-version-file: "go.mod" + cache: true + check-latest: true - - name: tags - run: | - git fetch --tags + - name: tags + run: | + git fetch --tags - - name: validate - run: | - # Check that go mod tidy produces a zero diff; clean up any changes afterwards. - go mod tidy && git diff --exit-code; code=$?; git checkout -- .; (exit $code) - # Check that go vet ./... produces a zero diff; clean up any changes afterwards. - go vet ./... && git diff --exit-code; code=$?; git checkout -- .; (exit $code) - # Check that go fmt ./... produces a zero diff; clean up any changes afterwards. - go fmt ./... && git diff --exit-code; code=$?; git checkout -- .; (exit $code) - # Check that go fix ./... produces a zero diff; clean up any changes afterwards. - # - # Renable this after https://github.com/golang/go/commit/7fd62ba821b1044e8e4077df052b0a1232672d57 - # has been released. - # go fix ./... && git diff --exit-code; code=$?; git checkout -- .; (exit $code) + - name: validate + run: | + # Check that go mod tidy produces a zero diff; clean up any changes afterwards. + go mod tidy && git diff --exit-code; code=$?; git checkout -- .; (exit $code) + # Check that go vet ./... produces a zero diff; clean up any changes afterwards. + go vet ./... && git diff --exit-code; code=$?; git checkout -- .; (exit $code) + # Check that go fmt ./... produces a zero diff; clean up any changes afterwards. + go fmt ./... && git diff --exit-code; code=$?; git checkout -- .; (exit $code) + # Check that go fix ./... produces a zero diff; clean up any changes afterwards. + go fix ./... && git diff --exit-code; code=$?; git checkout -- .; (exit $code) - - name: validate spec - run: | - make spec-install - make spec + - name: validate spec + run: | + make spec-install + make spec diff --git a/go.mod b/go.mod index d5bc0f1a0..9351d55d6 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/go-vela/server -go 1.22.0 - -toolchain go1.22.5 +go 1.23.1 require ( github.com/Bose/minisentinel v0.0.0-20200130220412-917c5a9223bb