diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5336a0f..7bb1f4f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,7 @@ jobs: - name: Install Go uses: actions/setup-go@v6 with: - go-version: '1.24.2' + go-version: '1.25' check-latest: true - name: Install libraries for ubuntu @@ -52,14 +52,14 @@ jobs: - name: Install Go uses: actions/setup-go@v6 with: - go-version: '1.24.2' + go-version: '1.25' check-latest: true - name: Install libraries for ubuntu run: | sudo apt install libx11-dev - - name: golangci-lint + - name: Run golangci-lint uses: golangci/golangci-lint-action@v9 with: - version: v2.1 + version: v2.6 diff --git a/DEVELOPING.md b/DEVELOPING.md new file mode 100644 index 0000000..ef94577 --- /dev/null +++ b/DEVELOPING.md @@ -0,0 +1,4 @@ +## Linting + +Developers need to manually install `golangci-lint`. +See: https://golangci-lint.run/docs/welcome/install/. diff --git a/Makefile b/Makefile index d332fcc..d2fa16e 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,10 @@ check-format: ## Check that sources are correctly formatted check-vet: ## Check source files with `go vet` go vet ./... +.PHONY: lint +lint: ## Lint source files with `golangci-lint run` + golangci-lint run + ##@ Code generation .PHONY: renku-users-apispec @@ -80,8 +84,6 @@ renku-users-apispec: ## Download the "users" API spec .PHONY: renku-session-apispec renku-session-apispec: ## Download the "session" API spec curl -L -o pkg/renkuapi/session/api.spec.yaml https://raw.githubusercontent.com/SwissDataScienceCenter/renku-data-services/refs/heads/main/components/renku_data_services/session/api.spec.yaml - # sed -e 's/- default: "general"//g' pkg/renkuapi/users/api.spec.yaml > pkg/renkuapi/users/api.spec.new.yaml - # mv pkg/renkuapi/users/api.spec.new.yaml pkg/renkuapi/users/api.spec.yaml .PHONY: generate generate: pkg/renkuapi/users/users_gen.go pkg/renkuapi/session/session_gen.go ## Run go generate diff --git a/README.md b/README.md index 430a495..59014d4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Miscellanous utilities for the @SwissDataScienceCenter/renku team. ## Installation -Installing `renku-dev-utils` requires go version `>= v1.24.1` and `make`. +Installing `renku-dev-utils` requires go version `>= v1.25` and `make`. ```bash make rdu diff --git a/go.mod b/go.mod index 6e42578..1085d43 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/SwissDataScienceCenter/renku-dev-utils -go 1.24.2 +go 1.25.4 tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen