From ace20726a401c454dc1cd6411012dd6ce83e029f Mon Sep 17 00:00:00 2001 From: Edvin N Date: Wed, 15 Jun 2022 22:31:27 +0200 Subject: [PATCH] [chore] Bump CI versions to latest releases (#771) * Bump CI versions * checkout to v3 * go to v3 * hadolint to v2.1.0 * /golangci-lint v2.5.2 * Specify v3 checkout * Add golangci-lint to Makefile * Downgrade checkout to v3 again For some reason it's not always possible to download latest version of checkout * use other versions * Use hadoolint and not a random fork.... * hadoolint 2.0.0 * it's better to copy and paste * hadoolint 2.1.0 --- .github/workflows/kind-e2e.yaml | 4 ++-- .github/workflows/pr-validation.yaml | 32 +++++++++++++--------------- .github/workflows/release.yaml | 4 ++-- Makefile | 9 ++++++-- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index b6ce96c0b..7f99f7b95 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone repo and checkout submodules - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.2 with: submodules: recursive - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: "^1.18.2" - name: Prepare diff --git a/.github/workflows/pr-validation.yaml b/.github/workflows/pr-validation.yaml index de8ccf8d3..c217b5a18 100644 --- a/.github/workflows/pr-validation.yaml +++ b/.github/workflows/pr-validation.yaml @@ -8,28 +8,26 @@ env: jobs: go-lint: runs-on: ubuntu-latest - env: - GO111MODULE: on steps: - name: Clone repo - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.2 - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: "1.18" - name: golangci-lint uses: golangci/golangci-lint-action@v2.5.2 with: - version: "v1.40.1" + version: "v1.46.2" only-new-issues: true fmt: runs-on: ubuntu-latest steps: - name: Clone repo - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.2 - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: "1.18" - name: Run fmt @@ -47,9 +45,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone repo - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.2 - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: "1.18" - name: Run manifests @@ -67,9 +65,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone repo - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.2 - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: "1.18" - name: Run api-docs @@ -87,9 +85,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone repo - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.2 - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: "1.18" - name: Run test @@ -110,7 +108,7 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v2.4.2 with: fetch-depth: 0 @@ -135,11 +133,11 @@ jobs: - 5000:5000 steps: - name: Clone repo and checkout submodules - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.2 with: submodules: recursive - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: "1.18" - name: Prepare @@ -153,7 +151,7 @@ jobs: echo ::set-output name=VERSION::${VERSION} echo ::set-output name=BUILDARCH::$(go env GOARCH) - name: Lint Dockerfile with hadolint - uses: brpaz/hadolint-action@v1.5.0 + uses: hadolint/hadolint-action@v2.1.0 with: dockerfile: Dockerfile - name: Set up QEMU diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3cabcce21..4ff4278c9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,11 +15,11 @@ jobs: DOCKER_PLATFORMS: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le steps: - name: Clone repo and checkout submodules - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.2 with: submodules: recursive - name: Setup go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: go-version: "1.18" - name: Prepare diff --git a/Makefile b/Makefile index 326b9cf69..be171e446 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,11 @@ KUSTOMIZE = $(shell pwd)/bin/kustomize kustomize: $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.2) +# Download kustomize locally if necessary +GOLANGCI = $(shell pwd)/bin/golangci-lint +golangci: + $(call go-get-tool,$(GOLANGCI),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2) + # go-get-tool will 'go install' any package $2 and install it to $1. PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) define go-get-tool @@ -163,8 +168,8 @@ code/check: fmt vet golint ./... .PHONY: code/golangci-lint -code/golangci-lint: - golangci-lint run ./... +code/golangci-lint: golangci + $(GOLANGCI) run ./... # Find or download gen-crd-api-reference-docs gen-crd-api-reference-docs: