Skip to content

Commit

Permalink
chore: use go.mod for managing Go tools (#8493)
Browse files Browse the repository at this point in the history
Signed-off-by: knqyf263 <[email protected]>
  • Loading branch information
knqyf263 authored Mar 5, 2025
1 parent 2998dcd commit 463b117
Show file tree
Hide file tree
Showing 12 changed files with 236 additions and 105 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/auto-update-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ jobs:
go-version-file: go.mod
cache: false

- name: Install aqua tools
uses: aquaproj/[email protected]
with:
aqua_version: v1.25.0
- name: Install Go tools
run: go install tool # GOBIN is added to the PATH by the setup-go action

- name: update labels
env:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/cache-test-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ jobs:
go-version-file: go.mod
cache: false

- name: Install tools
uses: aquaproj/[email protected]
with:
aqua_version: v1.25.0
- name: Install Go tools
run: go install tool # GOBIN is added to the PATH by the setup-go action

- name: Generate image list digest
if: github.ref_name == 'main'
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/publish-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,19 @@ jobs:
uses: actions/[email protected]
with:
fetch-depth: 0

- name: Set up Git user
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub Actions"
- name: Install tools
uses: aquaproj/[email protected]
- name: Set up Go
uses: actions/setup-go@v5
with:
aqua_version: v1.25.0
aqua_opts: ""
go-version-file: go.mod

- name: Install Go tools
run: go install tool # GOBIN is added to the PATH by the setup-go action

- name: Create a PR with Trivy version
run: mage helm:updateVersion
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/spdx-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ jobs:
- name: Check out code
uses: actions/[email protected]

- name: Install tools
uses: aquaproj/[email protected]
- name: Set up Go
uses: actions/setup-go@v5
with:
aqua_version: v1.25.0
aqua_opts: ""
go-version-file: go.mod

- name: Install Go tools
run: go install tool # GOBIN is added to the PATH by the setup-go action

- name: Check if SPDX exceptions are up-to-date
run: |
Expand Down
19 changes: 7 additions & 12 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,8 @@ jobs:
go-version-file: go.mod
cache: false

- name: Install tools
uses: aquaproj/[email protected]
with:
aqua_version: v1.25.0
- name: Install Go tools
run: go install tool # GOBIN is added to the PATH by the setup-go action

- name: Generate image list digest
id: image-digest
Expand Down Expand Up @@ -118,10 +116,8 @@ jobs:
go-version-file: go.mod
cache: false

- name: Install tools
uses: aquaproj/[email protected]
with:
aqua_version: v1.25.0
- name: Install Go tools
run: go install tool # GOBIN is added to the PATH by the setup-go action

- name: Run k8s integration tests
run: mage test:k8s
Expand All @@ -143,6 +139,7 @@ jobs:
uses: aquaproj/[email protected]
with:
aqua_version: v1.25.0
aqua_opts: ""

- name: Generate image list digest
id: image-digest
Expand Down Expand Up @@ -178,10 +175,8 @@ jobs:
go-version-file: go.mod
cache: false

- name: Install tools
uses: aquaproj/[email protected]
with:
aqua_version: v1.25.0
- name: Install Go tools
run: go install tool # GOBIN is added to the PATH by the setup-go action

- name: Generate image list digest
id: image-digest
Expand Down
2 changes: 1 addition & 1 deletion aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ registries:
packages:
- name: tinygo-org/[email protected]
- name: WebAssembly/binaryen@version_112
- name: magefile/[email protected]
- name: magefile/[email protected]
69 changes: 63 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ require (
cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/iam v1.2.2 // indirect
cloud.google.com/go/monitoring v1.21.2 // indirect
cloud.google.com/go/storage v1.45.0 // indirect
cloud.google.com/go/storage v1.49.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
Expand Down Expand Up @@ -214,7 +214,7 @@ require (
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
Expand Down Expand Up @@ -244,7 +244,7 @@ require (
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/validate v0.24.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-yaml v1.9.5 // indirect
github.com/goccy/go-yaml v1.15.23 // indirect
github.com/gofrs/uuid v4.3.1+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
Expand All @@ -254,7 +254,7 @@ require (
github.com/google/btree v1.1.2 // indirect
github.com/google/certificate-transparency-go v1.1.8 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.9 // indirect
Expand Down Expand Up @@ -351,7 +351,7 @@ require (
github.com/sigstore/timestamp-authority v1.2.2 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/afero v1.12.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
Expand Down Expand Up @@ -388,7 +388,7 @@ require (
go.opentelemetry.io/otel/trace v1.34.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/oauth2 v0.25.0 // indirect
golang.org/x/oauth2 v0.26.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
golang.org/x/time v0.9.0 // indirect
Expand Down Expand Up @@ -426,6 +426,11 @@ require (
)

require (
github.com/STARRY-S/zip v0.2.1 // indirect
github.com/adrg/xdg v0.5.3 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/aquaproj/aqua/v2 v2.45.0 // indirect
github.com/aws/aws-sdk-go v1.55.6 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
Expand All @@ -437,6 +442,58 @@ require (
github.com/aws/aws-sdk-go-v2/service/sso v1.25.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.16 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/bodgit/plumbing v1.3.0 // indirect
github.com/bodgit/sevenzip v1.6.0 // indirect
github.com/bodgit/windows v1.0.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/expr-lang/expr v1.16.9 // indirect
github.com/forPelevin/gomoji v1.3.0 // indirect
github.com/gdamore/encoding v1.0.0 // indirect
github.com/gdamore/tcell/v2 v2.6.0 // indirect
github.com/google/go-github/v31 v31.0.0 // indirect
github.com/google/go-github/v69 v69.2.0 // indirect
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
github.com/google/subcommands v1.2.0 // indirect
github.com/invopop/jsonschema v0.13.0 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/knqyf263/labeler v0.0.0-20200423181506-7a6e545148c3 // indirect
github.com/ktr0731/go-ansisgr v0.1.0 // indirect
github.com/ktr0731/go-fuzzyfinder v0.8.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mholt/archives v0.1.0 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
github.com/nsf/termbox-go v1.1.1 // indirect
github.com/nwaples/rardecode/v2 v2.0.0-beta.4.0.20241112120701-034e449c6e78 // indirect
github.com/oklog/ulid/v2 v2.1.0 // indirect
github.com/otiai10/copy v1.14.1 // indirect
github.com/otiai10/mint v1.6.3 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/samber/oops v1.15.0 // indirect
github.com/schollz/progressbar/v3 v3.18.0 // indirect
github.com/sorairolake/lzip-go v0.3.5 // indirect
github.com/suzuki-shunsuke/go-error-with-exit-code v1.0.0 // indirect
github.com/suzuki-shunsuke/go-findconfig v1.2.0 // indirect
github.com/suzuki-shunsuke/go-osenv v0.1.0 // indirect
github.com/suzuki-shunsuke/logrus-error v0.1.4 // indirect
github.com/suzuki-shunsuke/urfave-cli-help-all v0.0.4 // indirect
github.com/therootcompany/xz v1.0.1 // indirect
github.com/tonglil/versioning v0.0.0-20170205083536-8b2a4334bd1d // indirect
github.com/urfave/cli/v2 v2.27.5 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
sigs.k8s.io/kind v0.19.0 // indirect
)

tool (
github.com/aquaproj/aqua/v2/cmd/aqua
github.com/google/wire/cmd/wire
github.com/knqyf263/labeler
github.com/magefile/mage
golang.org/x/tools/cmd/goyacc
sigs.k8s.io/kind
)
Loading

0 comments on commit 463b117

Please sign in to comment.