Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port commits which were not ported from release/2.5 branch #558

Merged
merged 4 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ On the Nextcloud end, it allows users to:

* Link files and folders with work packages in OpenProject
* Find all work packages linked to a file or a folder
* Create work packages directly in Nextcloud
* View OpenProject notifications via the dashboard
* Search for work packages using Nextcloud's search bar
* Link work packages in rich text fields via Smart Picker
* Preview links to work packages in text fields
* Link multiple files and folders to a work package at once

On the OpenProject end, users are able to:

* View all Nextcloud files and folders linked to a work package
* Download linked files or open them in Nextcloud to edit them
* Open linked files in Nextcloud to edit them
* Let OpenProject create shared folders per project

Please report issues and bugs here: https://community.openproject.org/projects/nextcloud-integration/work_packages

Expand Down Expand Up @@ -573,20 +579,23 @@ npm run watch
#### 1. Release Preparation

##### a. In case of a major/minor version

1. Create a release branch from master with the name `release/<version>` e.g. `release/2.1`
2. Protect that new branch the same way as `master`
3. On the release branch update the version in `appinfo/info.xml`
4. Do QA and fixes of bugs in the release branch
5. Merge the release branch into the `master` branch, to get all good changes also into the current development
1. In case any new feature were added, update the feature description in `README.md` and `appinfo/info.xml`.
2. Create a release branch from master with the name `release/<version>` e.g. `release/2.1`
3. On the release branch update the version in `appinfo/info.xml`
4. Allow transifex to write on release branch i.e. update in `.tx/backport`
5. Do QA and fixes of bugs in the release branch
6. Update `.github/workflows/nighlty-ci-release-branch.yml` to run nightly on release branch
7. Merge the release branch into the `master` branch, to get all good changes also into the current development

##### b. In case of a patch version

1. On the release branch of the current minor version update the version in `appinfo/info.xml` (not needed for nightly builds)
2. Merge the release branch into the `master` branch, to get all good changes also into the current development
1. On the release branch of the current minor version update the version in `appinfo/info.xml` (not needed for nightly builds)
2. Merge the release branch into the `master` branch, to get all good changes also into the current development

#### 2. Publish Release
1. Tag a commit on the `release/<version>` branch. The tag must have the format `v2.1.1` for releases and `v2.1.1-20220928-nightly` for nightly builds.
e.g: `git tag v2.0.6-20220928-nightly -m "v2.0.6-20220928-nightly"`
3. Push the tag to the `auto-release` branch: `git push origin release/<version>:auto-release --tags -f`
4. Approve the deployment in GitHub actions
1. Tag a commit on the `release/<version>` branch. The tag must have the format `v2.1.1` for releases and `v2.1.1-20220928-nightly` for nightly builds.
>***Note:*** Every tag should be created with a unique commit or else the publish will fail.

e.g: `git tag v2.0.6-20220928-nightly -m "v2.0.6-20220928-nightly"`
2. Push the tag to the `auto-release` branch: `git push origin release/<version>:auto-release --tags -f`
3. Approve the deployment in GitHub actions
2 changes: 2 additions & 0 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ On the Nextcloud end, it allows users to:

* Link files and folders with work packages in OpenProject
* Find all work packages linked to a file or a folder
* Create work packages directly in Nextcloud
* View OpenProject notifications via the dashboard
* Search for work packages using Nextcloud's search bar
* Link work packages in rich text fields via Smart Picker
* Preview links to work packages in text fields
* Link multiple files and folder to a work package at once

On the OpenProject end, users are able to:

Expand Down
Binary file modified img/screenshot1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading