diff --git a/.github/workflows/generator.yaml b/.github/workflows/generator.yaml index 5f018f76c..c8ec9c80d 100644 --- a/.github/workflows/generator.yaml +++ b/.github/workflows/generator.yaml @@ -25,61 +25,7 @@ jobs: generator/go.sum - name: Display Go version run: go version - - run: go mod tidy - - run: go test ./... - - lint: - runs-on: ubuntu-24.04 - strategy: - matrix: - go-version: [ '1.23' ] - defaults: - run: - working-directory: generator - steps: - - uses: actions/checkout@v4 - - name: Setup Go ${{ matrix.go-version }} - uses: actions/setup-go@v5 - with: - go-version: ${{ matrix.go-version }} - cache-dependency-path: | - generator/go.sum - - name: Display Go version - run: go version - - run: go mod tidy - run: go fmt ./... - - run: go vet ./... - - run: | - # unparam does not seem to have releases. Using `latest` sounds risky. - go install mvdan.cc/unparam@57a3b4290ba3724102fdbbe72314f2b782d4bef5 - unparam ./... - - name: Run `staticcheck` - uses: dominikh/staticcheck-action@v1.3.0 - with: - install-go: false - cache-key: ${{ matrix.go-version }} - working-directory: generator + - run: go test ./... - name: Detect Changes run: git diff --exit-code - - vuln: - runs-on: ubuntu-24.04 - strategy: - matrix: - go-version: [ '1.23' ] - defaults: - run: - working-directory: generator - steps: - - uses: actions/checkout@v4 - - name: Setup Go ${{ matrix.go-version }} - uses: actions/setup-go@v5 - with: - go-version: ${{ matrix.go-version }} - cache-dependency-path: | - generator/go.sum - - name: Display Go version - run: go version - - run: | - go install golang.org/x/vuln/cmd/govulncheck@v1.1.3 - govulncheck ./... diff --git a/generator/all_test.go b/generator/all_test.go new file mode 100644 index 000000000..c75e3cb26 --- /dev/null +++ b/generator/all_test.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main_test + +import ( + "errors" + "os/exec" + "testing" +) + +func TestStaticCheck(t *testing.T) { + rungo(t, "run", "honnef.co/go/tools/cmd/staticcheck@v0.5.1", "./...") +} + +func TestUnparam(t *testing.T) { + rungo(t, "run", "mvdan.cc/unparam@v0.0.0-20240917084806-57a3b4290ba3", "./...") +} + +func TestVet(t *testing.T) { + rungo(t, "vet", "-all", "./...") +} + +func TestGoModTidy(t *testing.T) { + rungo(t, "mod", "tidy", "-diff") +} + +func TestGovulncheck(t *testing.T) { + rungo(t, "run", "golang.org/x/vuln/cmd/govulncheck@v1.1.3", "./...") +} + +func rungo(t *testing.T, args ...string) { + t.Helper() + + cmd := exec.Command("go", args...) + if output, err := cmd.CombinedOutput(); err != nil { + if ee := (*exec.ExitError)(nil); errors.As(err, &ee) && len(ee.Stderr) > 0 { + t.Fatalf("%v: %v\n%s", cmd, err, ee.Stderr) + } + t.Fatalf("%v: %v\n%s", cmd, err, output) + } +} diff --git a/generator/go.mod b/generator/go.mod index f51ee5eef..4e1bfa4af 100644 --- a/generator/go.mod +++ b/generator/go.mod @@ -4,7 +4,7 @@ go 1.23.2 require ( github.com/cbroglie/mustache v1.4.0 - github.com/google/go-cmp v0.6.0 + github.com/google/go-cmp v0.5.5 github.com/iancoleman/strcase v0.3.0 google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 google.golang.org/protobuf v1.35.1 diff --git a/generator/go.sum b/generator/go.sum index 8dfef8817..201e3c302 100644 --- a/generator/go.sum +++ b/generator/go.sum @@ -1,9 +1,11 @@ github.com/cbroglie/mustache v1.4.0 h1:Azg0dVhxTml5me+7PsZ7WPrQq1Gkf3WApcHMjMprYoU= github.com/cbroglie/mustache v1.4.0/go.mod h1:SS1FTIghy0sjse4DUVGV1k/40B1qE1XkD9DtDsHo9iM= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw= google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=