Skip to content

Commit 4dccc3c

Browse files
committed
Merge branch 't/release-instructions' of gregorydlogan/opencast-editor into r/17.x
Pull request #1644 Update release instructions
2 parents f91bb65 + fe51c2c commit 4dccc3c

File tree

1 file changed

+33
-16
lines changed

1 file changed

+33
-16
lines changed

README.md

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,33 +89,50 @@ Options which are usually specified in the configuration file are documented in
8989
| debug ||| Enable internationalization debugging. |
9090
| lng ||| Select a specific language. Use language codes like `de` or `en-US`. |
9191

92-
How to cut a release for Opencast
93-
---------------------------------
92+
93+
How to cut a release for Opencast with the Github UI
94+
----------------------------------------------------
9495

9596
1. (Optional) Run the [Update translations](https://github.com/opencast/opencast-editor/actions/workflows/update-translations.yml) workflow, to make sure all changes from crowdin are included in the next release.
96-
1. Run the [Create release tag](https://github.com/opencast/opencast-editor/actions/workflows/create-release.yml) workflow from the branch you want to release.
97+
98+
2. Run the [Create release tag](https://github.com/opencast/opencast-editor/actions/workflows/create-release.yml)
99+
workflow to create a correctly named tag in the appropriate branch. When running the workflow via the dropdown
100+
ensure you select the correct branch for the release!
97101
- This will create the tag in the forman N.x-YYYY-MM-DD
98-
- It will then create a new [GitHub release](https://github.com/opencast/opencast-editor/releases)
99-
- Review and edit the release to make sure the release notes are correct
100-
- By selecting the previous release, Github can generate release notes automatically
101-
- Finally it will create an upstream PR to the relevant [Opencast](http://github.com/opencast/opencast) branch incorporating the new release
102102

103-
Cutting manually
103+
3. Wait for the [Process release](https://github.com/opencast/opencast-editor/actions/workflows/process-release.yml)
104+
workflow to finish
105+
- It will create a new [GitHub release](https://github.com/opencast/opencast-editor/releases)
106+
- Review the release and make sure the notes are right, update them if not.
107+
- By selecting the previous release, Github can generate release notes automatically
108+
- This review isn't required to happen prior to the next step!
109+
110+
5. Merge the upstream issue that the workflow above filed in [Opencast's main repository](https://github.com/opencast/opencast)
111+
112+
113+
How to cut a release for Opencast manually with git
114+
---------------------------------------------------
104115

105-
1. Switch to the commit you want to turn into the release - make sure this is the on `develop` or an `r/N.x` branch
106-
1. Create and push a new tag
116+
1. (Optional) Run the [Update translations](https://github.com/opencast/opencast-editor/actions/workflows/update-translations.yml) workflow, to make sure all changes from crowdin are included in the next release.
117+
118+
2. Switch to the commit you want to turn into the release - make sure this is the on `develop` or an `r/N.x` branch
119+
120+
3. Create and push a new tag
107121
```bash
108122
BRANCH=N.x (make sure the version you write here matches the branch you have checked out)
109123
DATE=$(date +%Y-%m-%d)
110-
git tag -m "Release $BRANCH-$DATE" -s "$BRANCH-$DATE"
124+
git tag -sm "Release $BRANCH-$DATE" -s "$BRANCH-$DATE"
111125
git push upstream "$BRANCH-$DATE":"$BRANCH-$DATE"
112126
```
113-
1. Wait for the [Create release](https://github.com/opencast/opencast-editor/actions/workflows/process-release.yml)
127+
128+
3. Wait for the [Process release](https://github.com/opencast/opencast-editor/actions/workflows/process-release.yml)
114129
workflow to finish
115-
- It will then create a new [GitHub release](https://github.com/opencast/opencast-editor/releases)
116-
- Review and edit the release to make sure the release notes are correct
117-
- By selecting the previous release, Github can generate release notes automatically
118-
- Finally it will create an upstream PR to the relevant [Opencast](http://github.com/opencast/opencast) branch incorporating the new release
130+
- It will create a new [GitHub release](https://github.com/opencast/opencast-editor/releases)
131+
- Review the release and make sure the notes are right, update them if not.
132+
- By selecting the previous release, Github can generate release notes automatically
133+
- This review isn't required to happen prior to the next step!
134+
135+
5. Merge the upstream issue that the workflow above filed in [Opencast's main repository](https://github.com/opencast/opencast)
119136

120137

121138
Opencast API used by the Editor

0 commit comments

Comments
 (0)