Merge branch 'develop'

.github/workflows/release_hotfix.yml

@@ -26,5 +26,16 @@ jobs:
       run: |
         git config user.name "ami-ci"
         git config user.email "<>"
+    
+        # Update the package.json version. Skip the git tag, we'll do that later
+        npm version ${{ steps.bump-semver.outputs.new_version }} --no-git-tag-version
+
+        # Commit the changed package.json file to master
+        git add package.json
+        git commit -m "Bump version to ${{ steps.bump-semver.outputs.new_version }} [skip ci]"
+        git push origin master
+
+        # Tag the new version
         git tag ${{ steps.bump-semver.outputs.new_version }}
         git push origin ${{ steps.bump-semver.outputs.new_version }}
+

.github/workflows/release_version.yml

@@ -36,10 +36,22 @@ jobs:
       run: |
         git config user.name "ami-ci"
         git config user.email "<>"
-        git pull origin develop
+        git checkout develop
+    
+        # Update the package.json version. Skip the git tag, we'll do that later
+        npm version ${{ steps.bump-semver.outputs.new_version }} --no-git-tag-version
+
+        # Commit the changed package.json file to develop
+        git add package.json
+        git commit -m "Bump version to ${{ steps.bump-semver.outputs.new_version }} [skip ci]"
+        git push origin develop
+
+        # Merge develop into master
         git checkout master
         git merge develop
         git push origin master
+
+        # Tag the new version
         git tag ${{ steps.bump-semver.outputs.new_version }}
         git push origin ${{ steps.bump-semver.outputs.new_version }}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "customerio-gist-web",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "description": "Build beautiful in-app flows with no code and deliver them instantly to your app. http://customer.io",
   "private": false,
   "scripts": {