diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 98aa2c8..dff2989 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 }} ############################## @@ -282,12 +277,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.71.0 + env: + GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }} + WITH_V: false + CUSTOM_TAG: merge-${{ github.event.number }} - 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..431796d 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 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 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