Skip to content

Commit d9d9cae

Browse files
authored
DVO-231: Fix outdated CI builder image (#461)
* Fix boilerplate outdated information * Fix EOF * Fix lint CI task after the change in the operator image
1 parent 3b751f0 commit d9d9cae

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

Diff for: .ci-operator.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
2-
name: boilerplate
32
namespace: openshift
4-
tag: image-v5.0.1
3+
name: release
4+
tag: rhel-8-release-golang-1.22-openshift-4.17

Diff for: .gitattributes

-13
This file was deleted.

Diff for: .github/dependabot.yml

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@ updates:
88
schedule:
99
interval: "weekly"
1010
ignore:
11-
- dependency-name: "app-sre/boilerplate"
12-
# don't upgrade boilerplate via these means
1311
- dependency-name: "openshift4/ose-operator-registry"
1412
# don't upgrade ose-operator-registry via these means

Diff for: Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ endif
2929
go-mod-update:
3030
go mod vendor
3131

32+
.PHONY: ensure-golangci
33+
ensure-golangci:
34+
./ci/golangci-lint.sh
35+
3236
GOOS ?= linux
3337
GOENV=GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=1 ${FIPSENV}
3438
GOBUILDFLAGS=-gcflags="all=-trimpath=${GOPATH}" -asmflags="all=-trimpath=${GOPATH}"
@@ -41,7 +45,7 @@ go-build: go-mod-update
4145
GOLANGCI_OPTIONAL_CONFIG = .golangci.yml
4246
GOLANGCI_LINT_CACHE =/tmp/golangci-cache
4347
.PHONY: lint
44-
lint: go-mod-update
48+
lint: go-mod-update ensure-golangci
4549
@echo "## Running the golangci-lint tool..."
4650
GOLANGCI_LINT_CACHE=${GOLANGCI_LINT_CACHE} golangci-lint run -c ${GOLANGCI_OPTIONAL_CONFIG} ./...
4751

Diff for: ci/golangci-lint.sh

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
if [ -z "${GOPATH:-}" ]; then
6+
eval "$(go env | grep GOPATH)"
7+
fi
8+
9+
export BINARY=bin/golangci-lint
10+
if [ ! -f "$BINARY" ]; then
11+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.7
12+
fi

0 commit comments

Comments
 (0)