From fecb59122ac056892da366d3ee337b28dc027385 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 26 Nov 2024 11:47:41 +0100 Subject: [PATCH 1/6] add follow up actions --- RELEASE_PROCESS.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 181dcbbc50..bf2d6da96b 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -244,3 +244,27 @@ branches were created on demand. This model has now largely been replaced by the model we see in this document. However you might still encounter leftovers form the old model and you are encouraged to create issues regarding inconsistencies. + +## Follow up actions + +Review and merge open pull requests. + +### ocm-webiste + +[Update the website](https://github.com/open-component-model/ocm-website/pulls). + +### homebrew-tap + +[Update brew tap](https://github.com/open-component-model/homebrew-tap/pulls). + +### winget-pkgs + +[Check winget-pkgs PRs for: `New version: Open-Component-Model.ocm-cli`](https://github.com/microsoft/winget-pkgs/pulls?q=is%3Apr+is%3Aopen+New+version%3A+Open-Component-Model.ocm-cli). + +### chocolatey + +[Check the `Packages in Moderation`](https://community.chocolatey.org/profiles/ocm.software#profile-moderation). + +### piper-ocm-cli + +[Update piper-ocm-cli](https://github.tools.sap/open-component-model/piper-ocm-cli/pulls). From 6e1e0e08236afb57496b6428bf4c985038affa56 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 26 Nov 2024 11:48:35 +0100 Subject: [PATCH 2/6] fix some markdown lint issues --- RELEASE_PROCESS.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index bf2d6da96b..dfd8191fdb 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -18,8 +18,8 @@ created. The release branches are initially created from the `main` branch via the GitHub action [`Release Branch Creation`](./.github/workflows/release-branch.yaml). -A release is generated by calling a specific [ -`release`](./.github/workflows/release.yaml) GitHub Action. It is +A release is generated by calling a specific +[`release`](./.github/workflows/release.yaml) GitHub Action. It is executed on the branch which should be released - regardless whether it is a patch or a minor release. @@ -63,11 +63,11 @@ gitGraph TB: ### The Release Branch Creation / Cutoff -Every minor release starts with the creation of a release branch through [ -`Release Branch Creation`](./.github/workflows/release-branch.yaml). +Every minor release starts with the creation of a release branch through +[`Release Branch Creation`](./.github/workflows/release-branch.yaml). -The version / minor of the release is based on the content of the file [ -`VERSION`](./VERSION) which +The version / minor of the release is based on the content of the file +[`VERSION`](./VERSION) which is updated automatically said `release` action. During development, the content of this file is the complete release name of the release currently under development and the suffix `-dev` (e.g. `0.1.0-dev`). The content of this file @@ -93,8 +93,8 @@ This means that: the release manager - Any bug fix that is not deemed critical must be approved by the release manager -- Any bug fix must first be merged to main and then [ - `cherry-picked`](https://git-scm.com/docs/git-cherry-pick) to the release +- Any bug fix must first be merged to main and then + [`cherry-picked`](https://git-scm.com/docs/git-cherry-pick) to the release branch. At this point in time, any release targeted on this branch will have this minor @@ -143,12 +143,12 @@ and after a grace period, promote the draft release to a full release. This promotion is currently effectively a full rebuild from the release branch, with the difference that the `-rc.` suffix is removed. -After the build, instead of finishing, the [ -`release`](./.github/workflows/release.yaml) GitHub Action will also publish the +After the build, instead of finishing, the +[`release`](./.github/workflows/release.yaml) GitHub Action will also publish the release. -This publishing to package registries (such as brew) is delegated to [ -`publish-to-other-than-github`](./.github/workflows/publish-to-other-than-github.yaml) +This publishing to package registries (such as brew) is delegated to +[`publish-to-other-than-github`](./.github/workflows/publish-to-other-than-github.yaml) After the official release on a release branch was successful, the version is considered `burned`. This means that, even if bugs are found for that release in the future, a From 07fcc8170a4a5d367e80ebf592894c2d2f83b6ce Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 26 Nov 2024 11:54:18 +0100 Subject: [PATCH 3/6] spellchecked --- .github/config/wordlist.txt | 1 + RELEASE_PROCESS.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/config/wordlist.txt b/.github/config/wordlist.txt index 81e7bd3d34..fee477fa43 100644 --- a/.github/config/wordlist.txt +++ b/.github/config/wordlist.txt @@ -215,6 +215,7 @@ packageversion parameterization pendingdeprecationwarning pflag +pkgs podinfo podman pre diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index dfd8191fdb..01c028e92b 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -249,7 +249,7 @@ and you are encouraged to create issues regarding inconsistencies. Review and merge open pull requests. -### ocm-webiste +### ocm-website [Update the website](https://github.com/open-component-model/ocm-website/pulls). From 5331b96cc4c6eabd46d90f7830ccbf22f4af92f9 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 26 Nov 2024 12:43:28 +0100 Subject: [PATCH 4/6] add link to workflow runs --- RELEASE_PROCESS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 01c028e92b..a8f81a3f71 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -248,6 +248,8 @@ and you are encouraged to create issues regarding inconsistencies. ## Follow up actions Review and merge open pull requests. +See [Publish Release to other package registries than Github](https://github.com/open-component-model/ocm/actions/workflows/publish-to-other-than-github.yaml) workflow runs. +In case of error you can try to [Manually retrigger the publishing of ocm-cli to other repositories](https://github.com/open-component-model/ocm/actions/workflows/retrigger-publish-to-other.yaml). ### ocm-website From c23a9a3ac53d47ce48153d067fb3dfd6a40e19ff Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 26 Nov 2024 12:53:16 +0100 Subject: [PATCH 5/6] retrigger --- .github/config/wordlist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/config/wordlist.txt b/.github/config/wordlist.txt index fee477fa43..3bb353cc37 100644 --- a/.github/config/wordlist.txt +++ b/.github/config/wordlist.txt @@ -240,6 +240,7 @@ resendbuffer resmgmt resolvers resourcereference +retrigger routings routingslips rsa From 40b76c941ae07b488bae27dac8f69e409a4e5e00 Mon Sep 17 00:00:00 2001 From: Frederic Wilhelm Date: Tue, 26 Nov 2024 14:18:50 +0100 Subject: [PATCH 6/6] Update RELEASE_PROCESS.md Co-authored-by: Hilmar Falkenberg --- RELEASE_PROCESS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index a8f81a3f71..262b6da560 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -247,7 +247,7 @@ and you are encouraged to create issues regarding inconsistencies. ## Follow up actions -Review and merge open pull requests. +Review and merge open pull requests at the following locations. See [Publish Release to other package registries than Github](https://github.com/open-component-model/ocm/actions/workflows/publish-to-other-than-github.yaml) workflow runs. In case of error you can try to [Manually retrigger the publishing of ocm-cli to other repositories](https://github.com/open-component-model/ocm/actions/workflows/retrigger-publish-to-other.yaml).