From ba2ffcd561666cc91e48dec3b802d1ad4bd45b41 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Wed, 9 Oct 2024 14:54:36 +0200 Subject: [PATCH 1/5] update --- .github/workflows/push.yaml | 12 ++++++------ .github/workflows/release.yaml | 6 ++---- README.md | 8 ++++++++ theme_common | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 98aa2c8..6ca05f6 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -282,12 +282,12 @@ jobs: # github_token: ${{ secrets.STAKATER_GITHUB_TOKEN }} # branch: ${{ github.ref }} - # - name: Push Latest Tag - # uses: anothrNick/github-tag-action@1.70.0 - # env: - # GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }} - # WITH_V: true - # DEFAULT_BUMP: patch + - name: Push Latest Tag + uses: anothrNick/github-tag-action@1.70.0 + env: + GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }} + WITH_V: true + DEFAULT_BUMP: patch - name: Notify Slack uses: 8398a7/action-slack@v3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8ce5e61..a7a812c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,10 +1,8 @@ name: Release Go project on: - push: - tags: - # restricting it to only Major Versions 0,1,2 - - 'v[012].[0-9]+.[0-9]+' + release: + types: [published] env: DOCKER_FILE_PATH: Dockerfile diff --git a/README.md b/README.md index d80d372..1d7369d 100644 --- a/README.md +++ b/README.md @@ -442,6 +442,14 @@ PRs are welcome. In general, we follow the "fork-and-pull" Git workflow. **NOTE:** Be sure to merge the latest from "upstream" before making a pull request! +## Release Processes + +_Repository GitHub releases_: As requested by the community in [issue 685](https://github.com/stakater/Reloader/issues/685), Reloader is now based on a manual release process. Releases are no longer done on every merged PR to the main branch, but manually on request. When a GitHub release is made, the corresponding image is built and pushed to the registry. + +_Repository git tagging_: The Reloader repository is tagged on every push to main. The creation of a tag does not trigger anything else, it just acts as a pointer to a commit on main. + +_Helm chart versioning_: The Reloader Helm chart release process is still [work in progress](https://github.com/stakater/Reloader/issues/684). This page will be updated when the process is settled. As a headsup, to address the issues that are inherent in the current process the chart will most probably be relocated to the [Stakater charts repository](https://github.com/stakater/charts/). This setup is common in open-source repositories. When a GitHub release has been manually created in this repository, an image will be built, and Renovate in the charts repository will update the Helm chart to use it. + ## Changelog View our closed [Pull Requests](https://github.com/stakater/Reloader/pulls?q=is%3Apr+is%3Aclosed). diff --git a/theme_common b/theme_common index f63139f..0eef29f 160000 --- a/theme_common +++ b/theme_common @@ -1 +1 @@ -Subproject commit f63139f84ac5bd44d3ec567294c3bb30cb8c9ba6 +Subproject commit 0eef29f4cbd2491bbad359c7981501e80e26e78a From 6bf4620b1bf166f541cf7370b2d447573cf006c6 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Wed, 9 Oct 2024 14:55:38 +0200 Subject: [PATCH 2/5] update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d7369d..431796d 100644 --- a/README.md +++ b/README.md @@ -448,7 +448,7 @@ _Repository GitHub releases_: As requested by the community in [issue 685](https _Repository git tagging_: The Reloader repository is tagged on every push to main. The creation of a tag does not trigger anything else, it just acts as a pointer to a commit on main. -_Helm chart versioning_: The Reloader Helm chart release process is still [work in progress](https://github.com/stakater/Reloader/issues/684). This page will be updated when the process is settled. As a headsup, to address the issues that are inherent in the current process the chart will most probably be relocated to the [Stakater charts repository](https://github.com/stakater/charts/). This setup is common in open-source repositories. When a GitHub release has been manually created in this repository, an image will be built, and Renovate in the charts repository will update the Helm chart to use it. +_Helm chart versioning_: The Reloader Helm chart release process is still [work in progress](https://github.com/stakater/Reloader/issues/684). This page will be updated when the process is settled. As a heads-up, to address the issues that are inherent in the current process the chart will most probably be relocated to the [Stakater charts repository](https://github.com/stakater/charts/). This setup is common in open-source repositories. When a GitHub release has been manually created in this repository, an image will be built, and Renovate in the charts repository will update the Helm chart to use it. ## Changelog From 208a55f99530d600ffbeee5b9f059f2a0e30ca4e Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Mon, 14 Oct 2024 23:59:38 +0200 Subject: [PATCH 3/5] update --- .github/workflows/push.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 6ca05f6..27132a7 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -110,7 +110,6 @@ jobs: ${{ env.DOCKER_IMAGE_REPOSITORY }}:merge-${{ github.event.number }} labels: | org.opencontainers.image.source=${{ github.event.repository.clone_url }} - org.opencontainers.image.created=${{ steps.prep.outputs.created }} org.opencontainers.image.revision=${{ github.sha }} - name: Build and Push Docker UBI Image to Docker registry @@ -129,7 +128,6 @@ jobs: ${{ env.DOCKER_IMAGE_REPOSITORY }}:merge-${{ github.event.number }}-ubi labels: | org.opencontainers.image.source=${{ github.event.repository.clone_url }} - org.opencontainers.image.created=${{ steps.prep.outputs.created }} org.opencontainers.image.revision=${{ github.sha }} - name: Login to ghcr registry @@ -157,7 +155,6 @@ jobs: ${{ env.GHCR_IMAGE_REPOSITORY }}:merge-${{ github.event.number }} labels: | org.opencontainers.image.source=${{ github.event.repository.clone_url }} - org.opencontainers.image.created=${{ steps.prep.outputs.created }} org.opencontainers.image.revision=${{ github.sha }} - name: Build and Push Docker UBI Image to ghcr registry @@ -176,7 +173,6 @@ jobs: ${{ env.GHCR_IMAGE_REPOSITORY }}:merge-${{ github.event.number }}-ubi labels: | org.opencontainers.image.source=${{ github.event.repository.clone_url }} - org.opencontainers.image.created=${{ steps.prep.outputs.created }} org.opencontainers.image.revision=${{ github.sha }} - uses: dorny/paths-filter@v3 @@ -209,7 +205,6 @@ jobs: ${{ env.GHCR_IMAGE_REPOSITORY }}/docs:merge-${{ github.event.number }} labels: | org.opencontainers.image.source=${{ github.event.repository.clone_url }} - org.opencontainers.image.created=${{ steps.prep.outputs.created }} org.opencontainers.image.revision=${{ github.sha }} ############################## @@ -283,11 +278,12 @@ jobs: # branch: ${{ github.ref }} - name: Push Latest Tag - uses: anothrNick/github-tag-action@1.70.0 + uses: anothrNick/github-tag-action@1.71.0 env: GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }} WITH_V: true DEFAULT_BUMP: patch + CUSTOM_TAG: PR-${{ github.event.number }} - name: Notify Slack uses: 8398a7/action-slack@v3 From 7a9bb4fcbcf8cb363b52d3e801eff0c572ae28f1 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Tue, 15 Oct 2024 00:00:46 +0200 Subject: [PATCH 4/5] update --- .github/workflows/push.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 27132a7..cf0e7cb 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -281,8 +281,7 @@ jobs: uses: anothrNick/github-tag-action@1.71.0 env: GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }} - WITH_V: true - DEFAULT_BUMP: patch + WITH_V: false CUSTOM_TAG: PR-${{ github.event.number }} - name: Notify Slack From e210ea62fe16a4f30146f301881e011de0d78007 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Tue, 15 Oct 2024 08:25:23 +0200 Subject: [PATCH 5/5] update --- .github/workflows/push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index cf0e7cb..dff2989 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -282,7 +282,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }} WITH_V: false - CUSTOM_TAG: PR-${{ github.event.number }} + CUSTOM_TAG: merge-${{ github.event.number }} - name: Notify Slack uses: 8398a7/action-slack@v3