Skip to content

Commit dba1d45

Browse files
committed
Remove dependabot and use labeler from common
1 parent 1bb4a6f commit dba1d45

10 files changed

+28
-71
lines changed

.github/dependabot.yml

-12
This file was deleted.

.github/labeler.yml

-27
This file was deleted.

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- name: Run GoReleaser
105105
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
106106
with:
107-
version: latest
107+
version: v2.2.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
108108
args: release --clean
109109
env:
110110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dependabot-auto-merge.yml

-24
This file was deleted.

.github/workflows/labeler.yml

+8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@ jobs:
1212
pull-requests: write # for actions/labeler to add labels
1313
runs-on: ubuntu-22.04
1414
steps:
15+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
with:
17+
sparse-checkout: |
18+
labeler.yml
19+
sparse-checkout-cone-mode: false
20+
repository: nginxinc/k8s-common
21+
1522
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1623
with:
1724
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1825
sync-labels: true
26+
configuration-path: labeler.yml

.github/workflows/lint.yml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131

3232
- name: Lint Go
3333
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
34+
with:
35+
version: v1.60.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
3436

3537
actionlint:
3638
name: Actionlint

.golangci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ linters-settings:
3232
linters:
3333
enable:
3434
- asasalint
35-
- err113
3635
- asciicheck
3736
- bidichk
3837
- contextcheck
38+
- copyloopvar
3939
- dupword
4040
- durationcheck
41+
- err113
4142
- errcheck
4243
- errchkjson
4344
- errname
4445
- errorlint
45-
- exportloopref
4646
- fatcontext
4747
- forcetypeassert
4848
- gocheckcompilerdirectives

.pre-commit-config.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@ repos:
1111
- id: check-added-large-files
1212
- id: check-merge-conflict
1313
- id: check-shebang-scripts-are-executable
14+
- id: check-executables-have-shebangs
1415
- id: check-case-conflict
1516
- id: check-vcs-permalinks
17+
- id: check-json
18+
- id: pretty-format-json
19+
args: [--autofix, --no-ensure-ascii]
1620
- id: mixed-line-ending
1721
args: [--fix=lf]
1822
- id: no-commit-to-branch
1923
- id: fix-byte-order-marker
24+
- id: detect-private-key
2025

2126
- repo: https://github.com/golangci/golangci-lint
2227
rev: v1.60.1
@@ -46,3 +51,4 @@ repos:
4651

4752
ci:
4853
skip: [golangci-lint-full]
54+
autoupdate_schedule: quarterly # We use renovate for more frequent updates and there's no way to disable autoupdate

Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
# renovate: datasource=github-tags depName=golangci/golangci-lint
2+
GOLANGCI_LINT_VERSION = v1.60.1
3+
14
test: unit-test test-integration test-integration-no-stream-block clean
25

36
lint:
4-
docker run --pull always --rm -v $(shell pwd):/nginx-plus-go-client -w /nginx-plus-go-client -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest golangci-lint --color always run
7+
docker run --pull always --rm -v $(shell pwd):/nginx-plus-go-client -w /nginx-plus-go-client -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:$(GOLANGCI_LINT_VERSION) golangci-lint --color always run
58

69
unit-test:
710
go test -v -shuffle=on -race client/*.go

renovate.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"github>nginxinc/k8s-common"
5-
]
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"github>nginxinc/k8s-common",
5+
"schedule:earlyMondays"
6+
]
67
}

0 commit comments

Comments
 (0)