Merge pull request #17 from Emiliopg91/develop

Develop

.github/workflows/release.yml

@@ -46,22 +46,6 @@ jobs:
           name: AllyDeckyCompanion
           path: AllyDeckyCompanion.tar.gz
 
-      - name: Bump version to next DEV version
-        run: |
-          npm version --no-commit-hooks --no-git-tag-version prepatch --preid dev
-          jq '.version |= sub("-dev\\.0$"; "-dev")' package.json > package.tmp.json
-          mv package.tmp.json package.json
-
-      - name: Commit and push changes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add package.json
-          git commit -m "Bump version to prepatch"
-          git push origin HEAD:main
-
       - name: Create and push tag
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -81,7 +65,22 @@ jobs:
         run: |
           git merge -X theirs main --allow-unrelated-histories
           git push origin HEAD:develop --force
-          git checkout main
+
+      - name: Bump version to next DEV version
+        run: |
+          npm version --no-commit-hooks --no-git-tag-version prepatch --preid dev
+          jq '.version |= sub("-dev\\.0$"; "-dev")' package.json > package.tmp.json
+          mv package.tmp.json package.json
+
+      - name: Commit and push changes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git add package.json
+          git commit -m "Bump version to prepatch"
+          git push origin HEAD:main
 
       - run: mkdir /tmp/artifacts