Skip to content

Commit

Permalink
Fix golangci-lint job
Browse files Browse the repository at this point in the history
  • Loading branch information
efiacor committed Feb 5, 2025
1 parent b703689 commit b293a9d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
run:
build-tags:
- "-buildvcs=false"
timeout: 10m

issues:
Expand Down
8 changes: 3 additions & 5 deletions default-go-lint.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.


GOLANG_CI_VER ?= v1.62.2
GO_VERSION ?= 1.22.0
GOLANG_CI_VER ?= v1.63.4
GIT_ROOT_DIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
include $(GIT_ROOT_DIR)/detect-container-runtime.mk

Expand All @@ -23,7 +21,7 @@ include $(GIT_ROOT_DIR)/detect-container-runtime.mk
lint: ## Run Go linter against the codebase
ifeq ($(CONTAINER_RUNNABLE), 0)
$(RUN_CONTAINER_COMMAND) docker.io/golangci/golangci-lint:${GOLANG_CI_VER}-alpine \
golangci-lint run ./... -v --go=${GO_VERSION}
golangci-lint run ./... -v
else
golangci-lint run ./... -v --go=${GO_VERSION}
golangci-lint run ./... -v
endif
3 changes: 0 additions & 3 deletions operators/focom-operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ include ../../default-gosec.mk
include ../../default-go-lint.mk
include ../../default-go-misc.mk

# Override golangci-lint target version
GO_VERSION = 1.23.5

# VERSION defines the project version for the bundle.
# Update this value when you upgrade the version of your project.
# To re-generate a bundle for another specific version without changing the standard setup, you can:
Expand Down

0 comments on commit b293a9d

Please # to comment.