From 545d7e996b36ba51defb17da6ededa80143500f9 Mon Sep 17 00:00:00 2001 From: Timo Riski Date: Thu, 18 Jan 2024 12:43:18 +0100 Subject: [PATCH] ci: fix running trunk in `generate` action --- .github/workflows/generate.yml | 4 +--- Makefile | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index c66c4939c..1789c68b1 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -13,17 +13,15 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - with: - ref: ${{ github.head_ref }} - uses: actions/setup-go@v5 with: go-version-file: go.mod - name: install goimports run: | go install golang.org/x/tools/cmd/goimports@latest - - run: curl https://get.trunk.io -fsSL | bash - name: generate files run: make generate + - uses: trunk-io/trunk-action@v1 # Lint generated files - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: "chore(userconfigs): generate files" diff --git a/Makefile b/Makefile index da850b0fd..fe85fd7ce 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ boilerplate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..." .PHONY: generate -generate: userconfigs boilerplate imports manifests docs charts fmt +generate: userconfigs boilerplate imports manifests docs charts .PHONY: fmt fmt: