Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-05 06:09:12 +01:00
Code Issues Packages Projects Releases Activity

Prepare for next development iteration

Browse Source
This commit is contained in:
René Pfeuffer
2023-03-13 08:32:29 +01:00
parent 34410ce6c9
commit 1122f781a1
25 changed files with 127 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
docs/en/release-process.md
View File

@@ -85,6 +85,65 @@ Jenkins will
## Make a party
# Hotfix Releases of SCM-Manager
To release a hotfix version of SCM-Manager (or in other words a version, that is not based on the current
`develop` branch but on an older tag), there is a bit more manual work to do and there is no one-fits-all
way, so consider each step carefully and don't take this as a copy-paste manual like the normal release.
## Create hotfix branch
To trigger the release, create a hotfix branch on the tag you want to create the hotfix for (lets say,
that's version `2.30.0`) and prepare the release like above:
```bash
git checkout 2.30.0
git checkout -b hotfix/2.30.1
```
Then apply your fixes (eg. by cherry picking the relevant commits) and update the `CHANGELOG.md` (if you
have single changelog yaml files, you could use the `updateChangelog` like above). Add the `CHANGELOG.md`,
remove the yamls, and push the hotfix branch:
```
git rm -rf gradle/changelog
git add CHANGELOG.md
git commit -m "Adjust changelog for release 2.30.1"
git push origin hotfix/2.30.1
```
Jenkins will build and release the versions, create the new tag, but **will not** update the `main` or
`develop` branches. So these updates come next.
## Update Branches
Depending on whether you released a hotfix for an older version or the latest release, you have to update
the `main` branch to the new tag. So in our example, if there is no version `2.31.x` yet, the new version
`2.30.1` is the latest version and we have to update `main`:
```
git checkout main
git merge 2.30.1
git push origin main
```
Regardless of the `main` branch, you should update the `develop` branch and merge the hotfix to make clear,
that there are no changes that all changes are part of the current `develop` state. Normally, this leads
to merge conflicts, because the version on `develop` has been set to a new `SNAPSHOT`, while the version
of the hotfix has been updated to the new release version. So you have to merge all these conflicts manually.
```
git checkout develop
git merge 2.30.1
```
How these conflicts should be merged depends on the version that has been released:
- If it has been a hotfix for an older version, you could keep the SNAPSHOT versions and simply discard the
released version.
- If the hotfix is the new main, you should take this new version and then manually create a new SNAPSHOT
based on the new hotfix version number using gradle: `./gradlew setVersionToNextSnapshot`.
# How to release SCM-Manager v2 plugins
To release a new version of a Plugin for SCM-Manager v2 you have to do the following steps (replace placeholder `<version>` accordingly, eg. with `2.1.0`):

2
gradle.properties
View File

@@ -22,5 +22,5 @@
# SOFTWARE.
#
group = sonia.scm
version = 2.42.3
version = 2.42.4-SNAPSHOT
org.gradle.jvmargs=-Xmx1024M

4
scm-plugins/scm-git-plugin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-git-plugin",
"private": true,
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"license": "MIT",
"main": "./src/main/js/index.ts",
"scripts": {
@@ -11,7 +11,7 @@
"typecheck": "tsc"
},
"dependencies": {
"@scm-manager/ui-plugins": "2.42.3"
"@scm-manager/ui-plugins": "2.42.4-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

4
scm-plugins/scm-hg-plugin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-hg-plugin",
"private": true,
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"license": "MIT",
"main": "./src/main/js/index.ts",
"scripts": {
@@ -10,7 +10,7 @@
"typecheck": "tsc"
},
"dependencies": {
"@scm-manager/ui-plugins": "2.42.3"
"@scm-manager/ui-plugins": "2.42.4-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

4
scm-plugins/scm-legacy-plugin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-legacy-plugin",
"private": true,
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"license": "MIT",
"main": "./src/main/js/index.tsx",
"scripts": {
@@ -10,7 +10,7 @@
"typecheck": "tsc"
},
"dependencies": {
"@scm-manager/ui-plugins": "2.42.3"
"@scm-manager/ui-plugins": "2.42.4-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

4
scm-plugins/scm-svn-plugin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/scm-svn-plugin",
"private": true,
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"license": "MIT",
"main": "./src/main/js/index.ts",
"scripts": {
@@ -10,7 +10,7 @@
"typecheck": "tsc"
},
"dependencies": {
"@scm-manager/ui-plugins": "2.42.3"
"@scm-manager/ui-plugins": "2.42.4-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/babel-preset": "^2.13.1",

2
scm-ui/e2e-tests/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/e2e-tests",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"description": "End to end Tests for SCM-Manager",
"main": "index.js",
"author": "Eduard Heimbuch <eduard.heimbuch@cloudogu.com>",

4
scm-ui/ui-api/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-api",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"description": "React hook api for the SCM-Manager backend",
"main": "build/index.js",
"module": "build/index.mjs",
@@ -29,7 +29,7 @@
"tsup": "^5.12.6"
},
"dependencies": {
"@scm-manager/ui-types": "2.42.3",
"@scm-manager/ui-types": "2.42.4-SNAPSHOT",
"fetch-mock-jest": "^1.5.1",
"gitdiff-parser": "^0.2.2",
"query-string": "6.14.1",

6
scm-ui/ui-buttons/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-buttons",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"private": false,
"main": "build/index.js",
"module": "build/index.mjs",
@@ -24,11 +24,11 @@
"react-dom": "^17.0.1",
"react-router-dom": "^5.3.1",
"classnames": "^2.2.6",
"@scm-manager/ui-components": "2.42.3"
"@scm-manager/ui-components": "2.42.4-SNAPSHOT"
},
"devDependencies": {
"@scm-manager/prettier-config": "^2.11.1",
"@scm-manager/ui-api": "2.42.3",
"@scm-manager/ui-api": "2.42.4-SNAPSHOT",
"@scm-manager/eslint-config": "^2.17.0",
"@babel/core": "^7.17.8",
"@scm-manager/tsconfig": "^2.12.0",

16
scm-ui/ui-components/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-components",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"description": "UI Components for SCM-Manager and its plugins",
"main": "src/index.ts",
"files": [
@@ -20,15 +20,15 @@
"update-storyshots": "jest --testPathPattern=\"storyshots.test.ts\" --collectCoverage=false -u"
},
"devDependencies": {
"@scm-manager/ui-syntaxhighlighting": "2.42.3",
"@scm-manager/ui-shortcuts": "2.42.3",
"@scm-manager/ui-text": "2.42.3",
"@scm-manager/ui-syntaxhighlighting": "2.42.4-SNAPSHOT",
"@scm-manager/ui-shortcuts": "2.42.4-SNAPSHOT",
"@scm-manager/ui-text": "2.42.4-SNAPSHOT",
"@scm-manager/babel-preset": "^2.13.1",
"@scm-manager/eslint-config": "^2.17.0",
"@scm-manager/jest-preset": "^2.13.0",
"@scm-manager/prettier-config": "^2.10.1",
"@scm-manager/tsconfig": "^2.13.0",
"@scm-manager/ui-tests": "2.42.3",
"@scm-manager/ui-tests": "2.42.4-SNAPSHOT",
"@storybook/addon-actions": "^6.4.20",
"@storybook/addon-essentials": "^6.4.20",
"@storybook/addon-interactions": "^6.4.20",
@@ -67,9 +67,9 @@
},
"dependencies": {
"@headlessui/react": "^1.4.3",
"@scm-manager/ui-api": "2.42.3",
"@scm-manager/ui-extensions": "2.42.3",
"@scm-manager/ui-types": "2.42.3",
"@scm-manager/ui-api": "2.42.4-SNAPSHOT",
"@scm-manager/ui-extensions": "2.42.4-SNAPSHOT",
"@scm-manager/ui-types": "2.42.4-SNAPSHOT",
"classnames": "^2.2.6",
"date-fns": "^2.4.1",
"deepmerge": "^4.2.2",

4
scm-ui/ui-extensions/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-extensions",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"license": "MIT",
"private": false,
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",
@@ -17,7 +17,7 @@
"test": "jest"
},
"dependencies": {
"@scm-manager/ui-types": "2.42.3",
"@scm-manager/ui-types": "2.42.4-SNAPSHOT",
"react": "^17.0.1"
},
"devDependencies": {

12
scm-ui/ui-forms/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/ui-forms",
"private": false,
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"main": "build/index.js",
"types": "build/index.d.ts",
"module": "build/index.mjs",
@@ -16,7 +16,7 @@
"@scm-manager/eslint-config": "^2.16.0",
"@scm-manager/prettier-config": "^2.10.1",
"@scm-manager/tsconfig": "^2.13.0",
"@scm-manager/ui-styles": "2.42.3",
"@scm-manager/ui-styles": "2.42.4-SNAPSHOT",
"@storybook/addon-actions": "^6.5.10",
"@storybook/addon-essentials": "^6.5.10",
"@storybook/addon-interactions": "^6.5.10",
@@ -32,7 +32,7 @@
"tsup": "^6.2.3"
},
"peerDependencies": {
"@scm-manager/ui-components": "2.42.3",
"@scm-manager/ui-components": "2.42.4-SNAPSHOT",
"classnames": "^2.3.1",
"react": "17",
"react-hook-form": "7",
@@ -41,8 +41,8 @@
"styled-components": "5"
},
"dependencies": {
"@scm-manager/ui-buttons": "2.42.3",
"@scm-manager/ui-api": "2.42.3"
"@scm-manager/ui-buttons": "2.42.4-SNAPSHOT",
"@scm-manager/ui-api": "2.42.4-SNAPSHOT"
},
"prettier": "@scm-manager/prettier-config",
"eslintConfig": {
@@ -51,4 +51,4 @@
"publishConfig": {
"access": "public"
}
}
}

8
scm-ui/ui-legacy/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-legacy",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"private": true,
"main": "build/index.js",
"module": "build/index.mjs",
@@ -12,9 +12,9 @@
"test": "jest --passWithNoTests"
},
"dependencies": {
"@scm-manager/ui-api": "2.42.3",
"@scm-manager/ui-extensions": "2.42.3",
"@scm-manager/ui-types": "2.42.3",
"@scm-manager/ui-api": "2.42.4-SNAPSHOT",
"@scm-manager/ui-extensions": "2.42.4-SNAPSHOT",
"@scm-manager/ui-types": "2.42.4-SNAPSHOT",
"react": "^17.0.1",
"react-redux": "^5.0.7",
"redux": "^4.0.0"

2
scm-ui/ui-modules/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-modules",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"private": true,
"main": "build/index.js",
"module": "build/index.mjs",

4
scm-ui/ui-overlays/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@scm-manager/ui-overlays",
"private": false,
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"main": "build/index.js",
"types": "build/index.d.ts",
"module": "build/index.mjs",
@@ -16,7 +16,7 @@
"@scm-manager/eslint-config": "^2.16.0",
"@scm-manager/prettier-config": "^2.10.1",
"@scm-manager/tsconfig": "^2.13.0",
"@scm-manager/ui-styles": "2.42.3",
"@scm-manager/ui-styles": "2.42.4-SNAPSHOT",
"@storybook/addon-actions": "^6.5.10",
"@storybook/addon-essentials": "^6.5.10",
"@storybook/addon-interactions": "^6.5.10",

16
scm-ui/ui-plugins/package.json
View File

@@ -1,15 +1,15 @@
{
"name": "@scm-manager/ui-plugins",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"license": "MIT",
"bin": {
"ui-plugins": "./bin/ui-plugins.js"
},
"dependencies": {
"@scm-manager/ui-components": "2.42.3",
"@scm-manager/ui-extensions": "2.42.3",
"@scm-manager/ui-forms": "2.42.3",
"@scm-manager/ui-buttons": "2.42.3",
"@scm-manager/ui-components": "2.42.4-SNAPSHOT",
"@scm-manager/ui-extensions": "2.42.4-SNAPSHOT",
"@scm-manager/ui-forms": "2.42.4-SNAPSHOT",
"@scm-manager/ui-buttons": "2.42.4-SNAPSHOT",
"classnames": "^2.2.6",
"query-string": "6.14.1",
"react": "^17.0.1",
@@ -28,9 +28,9 @@
"@scm-manager/plugin-scripts": "^1.2.2",
"@scm-manager/prettier-config": "^2.10.1",
"@scm-manager/tsconfig": "^2.13.0",
"@scm-manager/ui-scripts": "2.42.3",
"@scm-manager/ui-tests": "2.42.3",
"@scm-manager/ui-types": "2.42.3",
"@scm-manager/ui-scripts": "2.42.4-SNAPSHOT",
"@scm-manager/ui-tests": "2.42.4-SNAPSHOT",
"@scm-manager/ui-types": "2.42.4-SNAPSHOT",
"@types/classnames": "^2.2.9",
"@types/enzyme": "^3.10.3",
"@types/fetch-mock": "^7.3.1",

2
scm-ui/ui-polyfill/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-polyfill",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"description": "Polyfills for SCM-Manager UI",
"main": "src/index.js",
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",

2
scm-ui/ui-scripts/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-scripts",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"description": "Build scripts for SCM-Manager",
"main": "src/index.js",
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",

2
scm-ui/ui-shortcuts/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-shortcuts",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"license": "MIT",
"private": true,
"main": "build/index.js",

2
scm-ui/ui-styles/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-styles",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"description": "Styles for SCM-Manager",
"main": "src/scm.scss",
"license": "MIT",

4
scm-ui/ui-syntaxhighlighting/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-syntaxhighlighting",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"private": true,
"main": "src/index.ts",
"scripts": {
@@ -13,7 +13,7 @@
"depcheck": "depcheck"
},
"dependencies": {
"@scm-manager/ui-text": "2.42.3",
"@scm-manager/ui-text": "2.42.4-SNAPSHOT",
"nanoid": "^3.3.2",
"react-diff-view": "^2.4.10",
"refractor": "^4.5.0"

2
scm-ui/ui-tests/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-tests",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"description": "UI-Tests helpers",
"author": "Sebastian Sdorra <sebastian.sdorra@cloudogu.com>",
"license": "MIT",

2
scm-ui/ui-text/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-text",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"private": true,
"main": "build/index.js",
"module": "build/index.mjs",

2
scm-ui/ui-types/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scm-manager/ui-types",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"description": "Typescript types for SCM-Manager related Objects",
"main": "src/index.ts",
"files": [

26
scm-ui/ui-webapp/package.json
View File

@@ -1,20 +1,20 @@
{
"name": "@scm-manager/ui-webapp",
"version": "2.42.3",
"version": "2.42.4-SNAPSHOT",
"private": true,
"dependencies": {
"@headlessui/react": "^1.4.3",
"@scm-manager/ui-api": "2.42.3",
"@scm-manager/ui-components": "2.42.3",
"@scm-manager/ui-extensions": "2.42.3",
"@scm-manager/ui-modules": "2.42.3",
"@scm-manager/ui-syntaxhighlighting": "2.42.3",
"@scm-manager/ui-text": "2.42.3",
"@scm-manager/ui-shortcuts": "2.42.3",
"@scm-manager/ui-legacy": "2.42.3",
"@scm-manager/ui-forms": "2.42.3",
"@scm-manager/ui-buttons": "2.42.3",
"@scm-manager/ui-overlays": "2.42.3",
"@scm-manager/ui-api": "2.42.4-SNAPSHOT",
"@scm-manager/ui-components": "2.42.4-SNAPSHOT",
"@scm-manager/ui-extensions": "2.42.4-SNAPSHOT",
"@scm-manager/ui-modules": "2.42.4-SNAPSHOT",
"@scm-manager/ui-syntaxhighlighting": "2.42.4-SNAPSHOT",
"@scm-manager/ui-text": "2.42.4-SNAPSHOT",
"@scm-manager/ui-shortcuts": "2.42.4-SNAPSHOT",
"@scm-manager/ui-legacy": "2.42.4-SNAPSHOT",
"@scm-manager/ui-forms": "2.42.4-SNAPSHOT",
"@scm-manager/ui-buttons": "2.42.4-SNAPSHOT",
"@scm-manager/ui-overlays": "2.42.4-SNAPSHOT",
"classnames": "^2.2.5",
"history": "^4.10.1",
"i18next": "21",
@@ -42,7 +42,7 @@
"devDependencies": {
"@scm-manager/eslint-config": "^2.17.0",
"@scm-manager/jest-preset": "^2.13.0",
"@scm-manager/ui-tests": "2.42.3",
"@scm-manager/ui-tests": "2.42.4-SNAPSHOT",
"@testing-library/react": "^12.1.5",
"@types/classnames": "^2.2.9",
"@types/enzyme": "^3.10.3",