Skip to content

Commit

Permalink
updated the version at the right location
Browse files Browse the repository at this point in the history
  • Loading branch information
Skarlso committed Jun 3, 2024
1 parent 4232ea9 commit 308a5f7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/lint_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ jobs:
- name: Setup lint
run: |
make -f hack/Makefile golangci-lint
#curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2
- name: Lint
run: |
PATH=$PATH:$(go env GOPATH)/bin make check
Expand All @@ -79,7 +78,7 @@ jobs:
steps:
- name: Self Hosted Runner Post Job Cleanup Action
uses: TooMuch4U/[email protected]

- name: Checkout
uses: actions/checkout@v4
with:
Expand All @@ -104,4 +103,4 @@ jobs:
- name: Check for diff
run: |
git diff --exit-code --shortstat
4 changes: 2 additions & 2 deletions hack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ else
detected_OS := $(shell sh -c 'uname 2>/dev/null || echo Unknown')
endif

deps :=
deps :=
# TODO exact versions to compare
gSED := $(shell (sed --version 2>/dev/null || echo 0.0) | head -n 1 | sed 's/.*(GNU sed) \([0-9\.]*\).*/\1/')
ifeq ("v$(gSED)","v0.0")
Expand All @@ -33,7 +33,7 @@ ifeq ("v$(JQ)","v0.0")
deps += $(detected_OS)_jq
endif

GOLANGCILINT_VERSION := "v1.54.2"
GOLANGCILINT_VERSION := "v1.58.1"
GOLANGCILINTV := $(shell (golangci-lint --version 2>/dev/null || echo 0.0.0) | sed 's/.*v\([0-9\.]*\) .*/\1/')
ifneq ("v$(GOLANGCILINTV)",$(GOLANGCILINT_VERSION))
deps += golangci-lint
Expand Down

0 comments on commit 308a5f7

Please sign in to comment.