From e3ab557a837b3673b5a7cd447d1ab6927c01bdb5 Mon Sep 17 00:00:00 2001 From: wass3rw3rk <49894298+wass3rw3rk@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:57:49 -0500 Subject: [PATCH 1/3] re-enable go fix see https://github.com/go-vela/community/issues/964 --- .github/workflows/validate.yml | 43 ++++++++++++++++------------------ 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 7783d860..4d5825bc 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -11,29 +11,26 @@ on: jobs: validate: 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@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 - with: - # use version from go.mod file - go-version-file: 'go.mod' - cache: true - check-latest: true + - name: install go + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + with: + # use version from go.mod file + go-version-file: "go.mod" + cache: true + check-latest: true - - 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) From 4d0cded84cfa1e09893b32c1073eb8d4814ce9fc Mon Sep 17 00:00:00 2001 From: wass3rw3rk <49894298+wass3rw3rk@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:58:25 -0500 Subject: [PATCH 2/3] deprecate Hooks type see https://github.com/go-vela/server/pull/1147 --- library/hook.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/hook.go b/library/hook.go index f9d6b5e5..4ab45d60 100644 --- a/library/hook.go +++ b/library/hook.go @@ -8,7 +8,7 @@ import ( // Hook is the library representation of a webhook for a repo. // -// swagger:model Webhook +// Deprecated: use Hook from github.com/go-vela/server/api/types instead. type Hook struct { ID *int64 `json:"id,omitempty"` RepoID *int64 `json:"repo_id,omitempty"` From ed35323610e9ba2e39cb8c6fee72c9bf108c3606 Mon Sep 17 00:00:00 2001 From: wass3rw3rk <49894298+wass3rw3rk@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:58:38 -0500 Subject: [PATCH 3/3] bump go to 1.23.1 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d4e14cab..5bda6396 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/go-vela/types -go 1.21.9 +go 1.23.1 require ( github.com/adhocore/gronx v1.8.1