From ca5f870eed433384cb6bae4e2a4b1185c5473198 Mon Sep 17 00:00:00 2001 From: yiannistri <8741709+yiannistri@users.noreply.github.com> Date: Tue, 28 May 2024 10:44:26 +0100 Subject: [PATCH] fix: Replace unapproved GH Actions with approved ones --- .github/workflows/apidiff.yaml | 3 ++- .github/workflows/e2e.yaml | 6 +++--- .github/workflows/lint.yaml | 3 +-- Makefile | 10 ++++++++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/apidiff.yaml b/.github/workflows/apidiff.yaml index 6a71621e..0234d22c 100644 --- a/.github/workflows/apidiff.yaml +++ b/.github/workflows/apidiff.yaml @@ -11,4 +11,5 @@ jobs: - uses: actions/setup-go@v5 with: go-version: 1.21.x - - uses: joelanford/go-apidiff@main + - name: Generate API diff + run: make apidiff diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index e3e28e47..9f6a952e 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -64,10 +64,10 @@ jobs: uses: actions/setup-go@v5 with: go-version: 1.21.x - - uses: engineerd/setup-kind@v0.5.0 + - uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0 with: - version: "v0.16.0" - skipClusterCreation: "true" + version: v0.23.0 + install_only: true - name: Create kind cluster run: make setup-kind - name: E2E tests diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 0de809f8..27ebcf90 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,7 +17,6 @@ jobs: with: go-version: 1.21.x - name: Analysis - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1 with: args: -v - skip-pkg-cache: true diff --git a/Makefile b/Makefile index c24f7659..1a7772ec 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,10 @@ GINKGO_VER := v2.17.1 GINKGO_BIN := ginkgo GINKGO := $(BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER) +GO_APIDIFF_VER := v0.8.2 +GO_APIDIFF_BIN := go-apidiff +GO_APIDIFF := $(BIN_DIR)/$(GO_APIDIFF_BIN)-$(GO_APIDIFF_VER) + SETUP_ENVTEST_VER := v0.0.0-20211110210527-619e6b92dab9 SETUP_ENVTEST_BIN := setup-envtest SETUP_ENVTEST := $(BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER) @@ -172,3 +176,9 @@ docker-build-e2e: .PHOHY: delete-local-kind-cluster delete-local-kind-cluster: ## Delete the local kind cluster kind delete cluster --name=$(CLUSTER_NAME) + +APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/release-v2.9) + +.PHONY: apidiff +apidiff: $(GO_APIDIFF) ## Check for API differences + $(GO_APIDIFF) $(APIDIFF_OLD_COMMIT) --print-compatible \ No newline at end of file