diff --git a/.github/workflows/meta-actions.yml b/.github/workflows/meta-actions.yaml similarity index 81% rename from .github/workflows/meta-actions.yml rename to .github/workflows/meta-actions.yaml index ca0a369..233e44e 100644 --- a/.github/workflows/meta-actions.yml +++ b/.github/workflows/meta-actions.yaml @@ -26,9 +26,8 @@ jobs: persist-credentials: false - uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0 with: - go-version-file: go.mod - - run: make actionlint - - run: bin/actionlint + go-version: stable + - run: make run-actionlint ghalint: runs-on: ubuntu-slim @@ -41,9 +40,8 @@ jobs: persist-credentials: false - uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0 with: - go-version-file: go.mod - - run: make ghalint - - run: bin/ghalint run && bin/ghalint run-action + go-version: stable + - run: make run-ghalint zizmor: runs-on: ubuntu-slim @@ -54,5 +52,4 @@ jobs: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false - - run: make zizmor - - run: bin/zizmor . + - run: make run-zizmor diff --git a/Makefile b/Makefile index 1e53c40..9105511 100644 --- a/Makefile +++ b/Makefile @@ -72,6 +72,19 @@ test: manifests generate fmt vet ## Run tests. lint: golangci-lint ## Run golangci-lint. $(GOLANGCI_LINT) run +.PHONY: run-actionlint +run-actionlint: actionlint ## Run actionlint for GitHub workflows and actions. + $(ACTIONLINT) + +.PHONY: run-ghalint +run-ghalint: ghalint ## Run ghalint for GitHub workflows and actions. + $(GHALINT) run + $(GHALINT) run-action + +.PHONY: run-zizmor +run-zizmor: zizmor ## Run zizmor for GitHub workflows and actions. + $(ZIZMOR) . + .PHONY: lint-fix lint-fix: golangci-lint ## Run golangci-lint and perform fixes. $(GOLANGCI_LINT) run --fix diff --git a/go.mod b/go.mod index 4018511..de4ea2d 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/topolvm/pie go 1.25.7 -toolchain go1.26.4 - require ( github.com/onsi/ginkgo/v2 v2.28.1 github.com/onsi/gomega v1.39.1