diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 8c745ea..e4b1c6f 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -80,11 +80,7 @@ jobs: make install - name: Run golangci-lint - uses: golangci/golangci-lint-action@v8 - with: - version: latest - only-new-issues: false - args: --timeout 10m + run: make lint - name: Helm Lint run: | diff --git a/.github/workflows/push-pr-image.yaml b/.github/workflows/push-pr-image.yaml index 7a0f4a9..eff22f7 100644 --- a/.github/workflows/push-pr-image.yaml +++ b/.github/workflows/push-pr-image.yaml @@ -47,11 +47,7 @@ jobs: make install - name: Run golangci-lint - uses: golangci/golangci-lint-action@v8 - with: - version: latest - only-new-issues: false - args: --timeout 10m + run: make lint - name: Generate Tags id: generate_tag diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 39b8d2e..dda9a1c 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -53,11 +53,7 @@ jobs: make install - name: Run golangci-lint - uses: golangci/golangci-lint-action@v8 - with: - version: latest - only-new-issues: false - args: --timeout 10m + run: make lint - name: Install kubectl run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6a3509d..6bd392f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -48,11 +48,7 @@ jobs: make install - name: Run golangci-lint - uses: golangci/golangci-lint-action@v8 - with: - version: latest - only-new-issues: false - args: --timeout 10m + run: make lint - name: Install kubectl run: | diff --git a/Makefile b/Makefile index b0316cf..8444e1f 100644 --- a/Makefile +++ b/Makefile @@ -102,6 +102,9 @@ run: build: "$(GOCMD)" build ${GOFLAGS} ${LDFLAGS} -o "${BINARY}" +lint: golangci-lint ## Run golangci-lint on the codebase + $(GOLANGCI_LINT) run ./... + build-image: docker buildx build \ --platform ${OS}/${ARCH} \ diff --git a/README.md b/README.md index abc29f6..3290185 100644 --- a/README.md +++ b/README.md @@ -439,7 +439,8 @@ To make a GitHub release: - Set the `TARGET_VERSION` to release version without 'v' i.e. `X.Y.Z` 1. A PR is created to bump the image version on the release branch, example: [PR-798](https://github.com/stakater/Reloader/pull/798) 1. Code owners create a GitHub release with tag `vX.Y.Z` and target branch `release-vX.Y.Z`, which triggers creation of images -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) +1. Code owners create another branch from master and bump the helm chart version as well as reloader image version. + - Code owners create a PR with `release/helm-chart` label, example: [PR-846](https://github.com/stakater/Reloader/pull/846) _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.