Skip to content

Commit

Permalink
[chore] Bump CI versions to latest releases (#771)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
NissesSenap committed Jun 15, 2022
1 parent bf86d76 commit ace2072
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/kind-e2e.yaml
Expand Up @@ -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
Expand Down
32 changes: 15 additions & 17 deletions .github/workflows/pr-validation.yaml
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -110,7 +108,7 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v2.4.2
with:
fetch-depth: 0

Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions Makefile
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit ace2072

Please sign in to comment.