Skip to content

Commit 44c9931

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1114 from kuiwang02/mvlintbindata
OCPQE-29415:move golangci-lint and go-bindata to new location to fix sync
2 parents 56f9906 + fd5119f commit 44c9931

File tree

13 files changed

+1031
-440
lines changed

13 files changed

+1031
-440
lines changed

‎.bingo/Variables.mk‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,16 @@ GO ?= $(shell which go)
77

88
# Below generated variables ensure that every time a tool under each variable is invoked, the correct version
99
# will be used; reinstalling only if needed.
10-
# For example for go-bindata variable:
10+
# For example for helm variable:
1111
#
1212
# In your main Makefile (for non array binaries):
1313
#
1414
#include .bingo/Variables.mk # Assuming -dir was set to .bingo .
1515
#
16-
#command: $(GO_BINDATA)
17-
# @echo "Running go-bindata"
18-
# @$(GO_BINDATA) <flags/args..>
16+
#command: $(HELM)
17+
# @echo "Running helm"
18+
# @$(HELM) <flags/args..>
1919
#
20-
GO_BINDATA := $(GOBIN)/go-bindata-v3.1.2+incompatible
21-
$(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
22-
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
23-
@echo "(re)installing $(GOBIN)/go-bindata-v3.1.2+incompatible"
24-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.2+incompatible "github.com/go-bindata/go-bindata/go-bindata"
25-
26-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.1.6
27-
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
28-
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
29-
@echo "(re)installing $(GOBIN)/golangci-lint-v2.1.6"
30-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.1.6 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
31-
3220
HELM := $(GOBIN)/helm-v3.15.2
3321
$(HELM): $(BINGO_DIR)/helm.mod
3422
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.

‎.bingo/golangci-lint.sum‎

Lines changed: 0 additions & 418 deletions
This file was deleted.

‎.bingo/variables.env‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,5 @@ if [ -z "$GOBIN" ]; then
88
fi
99

1010

11-
GO_BINDATA="${GOBIN}/go-bindata-v3.1.2+incompatible"
12-
13-
GOLANGCI_LINT="${GOBIN}/golangci-lint-v2.1.6"
14-
1511
HELM="${GOBIN}/helm-v3.15.2"
1612

‎tests-extension/.bingo/.gitignore‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
# Ignore everything
3+
*
4+
5+
# But not these files:
6+
!.gitignore
7+
!*.mod
8+
!*.sum
9+
!README.md
10+
!Variables.mk
11+
!variables.env
12+
13+
*tmp.mod

‎tests-extension/.bingo/README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Project Development Dependencies.
2+
3+
This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo.
4+
5+
* Run `bingo get` to install all tools having each own module file in this directory.
6+
* Run `bingo get <tool>` to install <tool> that have own module file in this directory.
7+
* For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
8+
* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
9+
* For go: Import `.bingo/variables.go` to for variable names.
10+
* See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.
11+
12+
## Requirements
13+
14+
* Go 1.14+

‎tests-extension/.bingo/Variables.mk‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT.
2+
# All tools are designed to be build inside $GOBIN.
3+
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
4+
GOPATH ?= $(shell go env GOPATH)
5+
GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin
6+
GO ?= $(shell which go)
7+
8+
# Below generated variables ensure that every time a tool under each variable is invoked, the correct version
9+
# will be used; reinstalling only if needed.
10+
# For example for go-bindata variable:
11+
#
12+
# In your main Makefile (for non array binaries):
13+
#
14+
#include .bingo/Variables.mk # Assuming -dir was set to .bingo .
15+
#
16+
#command: $(GO_BINDATA)
17+
# @echo "Running go-bindata"
18+
# @$(GO_BINDATA) <flags/args..>
19+
#
20+
GO_BINDATA := $(GOBIN)/go-bindata-v3.1.2+incompatible
21+
$(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
22+
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
23+
@echo "(re)installing $(GOBIN)/go-bindata-v3.1.2+incompatible"
24+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.2+incompatible "github.com/go-bindata/go-bindata/go-bindata"
25+
26+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.1.6
27+
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
28+
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
29+
@echo "(re)installing $(GOBIN)/golangci-lint-v2.1.6"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.1.6 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
31+

.bingo/go-bindata.mod renamed to tests-extension/.bingo/go-bindata.mod

File renamed without changes.

.bingo/go-bindata.sum renamed to tests-extension/.bingo/go-bindata.sum

File renamed without changes.

‎tests-extension/.bingo/go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.

.bingo/golangci-lint.mod renamed to tests-extension/.bingo/golangci-lint.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

33
go 1.24.4
44

5-
require github.com/golangci/golangci-lint/v2 v2.1.6
5+
require github.com/golangci/golangci-lint/v2 v2.1.6 // cmd/golangci-lint

0 commit comments

Comments
 (0)