Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: boilerplate
namespace: openshift
tag: image-v5.0.1
name: release
tag: rhel-8-release-golang-1.22-openshift-4.17
13 changes: 0 additions & 13 deletions .gitattributes

This file was deleted.

2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@ updates:
schedule:
interval: "weekly"
ignore:
- dependency-name: "app-sre/boilerplate"
# don't upgrade boilerplate via these means
- dependency-name: "openshift4/ose-operator-registry"
# don't upgrade ose-operator-registry via these means
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ endif
go-mod-update:
go mod vendor

.PHONY: ensure-golangci
ensure-golangci:
./ci/golangci-lint.sh

GOOS ?= linux
GOENV=GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=1 ${FIPSENV}
GOBUILDFLAGS=-gcflags="all=-trimpath=${GOPATH}" -asmflags="all=-trimpath=${GOPATH}"
Expand All @@ -41,7 +45,7 @@ go-build: go-mod-update
GOLANGCI_OPTIONAL_CONFIG = .golangci.yml
GOLANGCI_LINT_CACHE =/tmp/golangci-cache
.PHONY: lint
lint: go-mod-update
lint: go-mod-update ensure-golangci
@echo "## Running the golangci-lint tool..."
GOLANGCI_LINT_CACHE=${GOLANGCI_LINT_CACHE} golangci-lint run -c ${GOLANGCI_OPTIONAL_CONFIG} ./...

Expand Down
12 changes: 12 additions & 0 deletions ci/golangci-lint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

set -ex

if [ -z "${GOPATH:-}" ]; then
eval "$(go env | grep GOPATH)"
fi

export BINARY=bin/golangci-lint
if [ ! -f "$BINARY" ]; then
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.7
fi