1.21 + take versions from sources

open-component-model · Oct 31, 2023 · 9bd8c81 · 9bd8c81
1 parent 37caaf1
commit 9bd8c81
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml
@@ -66,7 +66,8 @@ jobs:
           go install golang.org/x/tools/cmd/goimports@latest
       - name: Setup lint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2
+          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

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,5 +1,5 @@
 run:
-  go: "1.20"
+  go: "1.21"
   timeout: 10m
   tests: false
   allow-parallel-runners: true

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/open-component-model/ocm
 
-go 1.20
+go 1.21
 
 replace github.com/spf13/cobra => github.com/open-component-model/cobra v0.0.0-20230329075350-b1fd876abfb9
 

diff --git a/hack/Makefile b/hack/Makefile
@@ -50,7 +50,13 @@ install-requirements: $(deps) $(GOPATH)/bin/goimports
 
 .PHONY: golangci-lint
 golangci-lint:
-	go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCILINT_VERSION)
+	@# no recommended by website
+	@# go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCILINT_VERSION)
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin $(GOLANGCILINT_VERSION)
+
+.PHONY: golangci-lint-version
+golangci-lint-version:
+	@echo "$(GOLANGCILINT_VERSION)"
 
 .PHONY: go-bindata
 go-bindata: