Merge pull request #39 from Geode-solutions/next

Author: JulienChampagnol

.github/workflows/CD.yml

@@ -26,4 +26,13 @@ jobs:
       if: steps.semantic-release.outputs.released == 'true'
       run: |
         python3 -m pip install twine
-        python3 -m twine upload --repository pypi dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }} 
+        python3 -m twine upload --repository pypi dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }}
+    - name: Merge master -> next
+      if: github.ref == 'ref/head/master'
+      uses: devmasx/merge-branch@master
+      with:
+        type: now
+        from_branch: master
+        target_branch: next
+        github_token: ${{ github.token }}
+

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 
 
+## v2.1.0-rc.1 (2023-11-15)
+
+### Feature
+
+* feat(github_workflows): merge from master to next ([`a93888c`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/a93888c5c87d1a9b6a64401e9eb55d1bb7015d18))
+
+### Unknown
+
+* Merge pull request #38 from Geode-solutions/feat_merge_master_to_next ([`a164e0f`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/a164e0f925d22d0d9cfe3f59f34f1fb7d9e8cf74))
+
+
 ## v2.0.0 (2023-11-15)
 
 ### Unknown

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "2.0.0"
+version = "2.1.0-rc.1"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },