Merge pull request #80 from cohen72/develop

aa

Author: cohen72

.github/workflows/release.yml

@@ -33,15 +33,21 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+      - name: If on master, merge semantic release commits back to develop
+        if: github.ref == 'refs/heads/master'
+        run: |
+          git checkout develop
+          git merge --ff-only master
+          git push --force --set-upstream origin develop
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       # If on master!
       - name: Add White Label Tags
         if: |
           github.ref == 'refs/heads/master' &&
           steps.semantic.outputs.new-release-published == 'true'
         run: |
-          git checkout develop
-          git merge --ff-only master
-          git push --force --set-upstream origin develop
           git checkout master
           git tag akronites/${{steps.semantic.outputs.release-version}}
           git push origin akronites/${{steps.semantic.outputs.release-version}}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "git-playground",
-	"version": "1.0.10",
+	"version": "1.0.11-qa.1",
 	"private": true,
 	"scripts": {
 		"postversion": "react-native-version --never-amend"