Skip to content

Commit 918c6ff

Browse files
committed
Resolved comments
1 parent d514e31 commit 918c6ff

6 files changed

Lines changed: 9 additions & 21 deletions

File tree

.github/workflows/pull_request.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,7 @@ jobs:
8080
make install
8181
8282
- name: Run golangci-lint
83-
uses: golangci/golangci-lint-action@v8
84-
with:
85-
version: latest
86-
only-new-issues: false
87-
args: --timeout 10m
83+
run: make lint
8884

8985
- name: Helm Lint
9086
run: |

.github/workflows/push-pr-image.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ jobs:
4747
make install
4848
4949
- name: Run golangci-lint
50-
uses: golangci/golangci-lint-action@v8
51-
with:
52-
version: latest
53-
only-new-issues: false
54-
args: --timeout 10m
50+
run: make lint
5551

5652
- name: Generate Tags
5753
id: generate_tag

.github/workflows/push.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ jobs:
5353
make install
5454
5555
- name: Run golangci-lint
56-
uses: golangci/golangci-lint-action@v8
57-
with:
58-
version: latest
59-
only-new-issues: false
60-
args: --timeout 10m
56+
run: make lint
6157

6258
- name: Install kubectl
6359
run: |

.github/workflows/release.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ jobs:
4848
make install
4949
5050
- name: Run golangci-lint
51-
uses: golangci/golangci-lint-action@v8
52-
with:
53-
version: latest
54-
only-new-issues: false
55-
args: --timeout 10m
51+
run: make lint
5652

5753
- name: Install kubectl
5854
run: |

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ run:
102102
build:
103103
"$(GOCMD)" build ${GOFLAGS} ${LDFLAGS} -o "${BINARY}"
104104

105+
lint: golangci-lint ## Run golangci-lint on the codebase
106+
$(GOLANGCI_LINT) run ./...
107+
105108
build-image:
106109
docker buildx build \
107110
--platform ${OS}/${ARCH} \

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,8 @@ To make a GitHub release:
439439
- Set the `TARGET_VERSION` to release version without 'v' i.e. `X.Y.Z`
440440
1. A PR is created to bump the image version on the release branch, example: [PR-798](https://github.com/stakater/Reloader/pull/798)
441441
1. Code owners create a GitHub release with tag `vX.Y.Z` and target branch `release-vX.Y.Z`, which triggers creation of images
442-
1. Code owners create a PR with `release/helm-chart` label to update the Helm chart version, example: [PR-846](https://github.com/stakater/Reloader/pull/846)
442+
1. Code owners create another branch from master and bump the helm chart version as well as reloader image version.
443+
- Code owners create a PR with `release/helm-chart` label, example: [PR-846](https://github.com/stakater/Reloader/pull/846)
443444

444445
_Repository git tagging_: Push to the main branch will create a merge-image and merge-tag named `merge-${{ github.event.number }}`, for example `merge-800` when pull request number 800 is merged.
445446

0 commit comments

Comments
 (0)