|
7 | 7 | - [Use the Latest Dataverse Client Javascript Version](#use-the-latest-dataverse-client-javascript-version) |
8 | 8 | - [Merge "release branch" into "main"](#merge-release-branch-into-main) |
9 | 9 | - [Create a Draft Release on GitHub and Tag the Version](#create-a-draft-release-on-github-and-tag-the-version) |
10 | | -- [Merge "release branch" into "develop"](#merge-release-branch-into-develop) |
11 | | -- [Delete "release branch"](#delete-release-branch) |
| 10 | +- [Sync "develop" branch with changes from "main"](#sync-develop-branch-with-changes-from-main) |
| 11 | +- [Delete "release branch" and "sync develop" branch](#delete-release-branch-and-sync-develop-branch) |
12 | 12 |
|
13 | 13 | ## Introduction |
14 | 14 |
|
@@ -83,8 +83,7 @@ Before releasing, ensure the changelog is properly prepared: |
83 | 83 | ### Removed |
84 | 84 | ``` |
85 | 85 |
|
86 | | -4. **Update the version links** at the bottom of the changelog files |
87 | | -5. **Commit the changelog updates** as part of the release preparation |
| 86 | +4. **Commit the changelog updates** as part of the release preparation |
88 | 87 |
|
89 | 88 | ## Use the Latest Dataverse Client Javascript Version |
90 | 89 |
|
@@ -128,21 +127,18 @@ Go to https://github.com/IQSS/dataverse-frontend/releases/new to start creating |
128 | 127 |
|
129 | 128 | At this point you can send around the draft release for any final feedback. Make corrections to the draft, if necessary. Publish once everything is ok. |
130 | 129 |
|
131 | | -## Merge "release branch" into "develop" |
| 130 | +## Sync develop branch with changes from main |
132 | 131 |
|
133 | 132 | After merging the release branch into `main`, ensure the develop branch is updated with the latest changes. |
134 | 133 |
|
135 | | -```shell |
136 | | -git checkout develop |
137 | | -git merge release/X.X.X |
138 | | -git push origin develop |
139 | | -``` |
| 134 | +Create a pull request to sync the `develop` branch with the `main` branch. Create the branch from `main` and name it `sync-develop-v[version-number]`. |
140 | 135 |
|
141 | | -## Delete "release branch" |
| 136 | +This is a good time to revert or adjust any release-specific changes that are **not needed in `develop`**, such as: |
142 | 137 |
|
143 | | -Once the release process is complete and the `release` branch has been merged into both `main` and `develop`, you can safely delete the `release` branch to keep the repository clean. |
| 138 | +- Using the npm version of the latest `@iqss/dataverse-client-javascript` package — check what alpha version is used in `develop` and revert to that version. |
| 139 | +- Updating the `E2E_DATAVERSE_IMAGE_TAG` in `workflows/test.yml` — revert it to the value used in `develop` (usually `unstable`). |
| 140 | +- Any other release-only changes or configuration updates that should not persist in `develop`. |
144 | 141 |
|
145 | | -- Delete the branch locally from your repository. |
146 | | -- Delete the branch remotely from the remote repository. |
| 142 | +## Delete "release branch" and "sync-develop" branch. |
147 | 143 |
|
148 | | -This ensures that the `release` branch is no longer present in either your local or remote repositories. |
| 144 | +Once the release process is complete and the changes have been merged into both `main` and `develop`, you can delete the `release` branch and the `sync-develop` branch to keep the repository clean. |
0 commit comments