[#98] new approach

.github/workflows/changelog.yml

@@ -33,23 +33,31 @@ jobs:
           git config --local user.name "$ACTION_USERNAME"
           git add CHANGELOG.md && git commit -m 'Updated CHANGELOG.md' && echo ::set-env name=push::1 || echo "No changes to CHANGELOG.md"
 
-      - name: Push changelog to master
-        if: env.push == 1
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
-          branch: master
-
-      - name: Cherry-pick changelog to development
+      - name: Push changes
         if: env.push == 1
         env:
-          ACTION_EMAIL: [email protected]
-          ACTION_USERNAME: GitHub Action
+          # CI_USER: ${{ secrets.YOUR_GITHUB_USER }}
+          CI_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
         run: |
-          git config --local user.email "$ACTION_EMAIL"
-          git config --local user.name "$ACTION_USERNAME"
-          commit_hash=`git show HEAD | egrep commit\ .+$ | cut -d' ' -f2`
-          git checkout development
-          git pull
-          git cherry-pick $commit_hash
-          git push
+          git push "https://$GITHUB_ACTOR:[email protected]/$GITHUB_REPOSITORY.git" HEAD:master
+
+      # - name: Push changelog to master
+      #   if: env.push == 1
+      #   uses: ad-m/github-push-action@master
+      #   with:
+      #     github_token: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
+      #     branch: master
+
+      # - name: Cherry-pick changelog to development
+      #   if: env.push == 1
+      #   env:
+      #     ACTION_EMAIL: [email protected]
+      #     ACTION_USERNAME: GitHub Action
+      #   run: |
+      #     git config --local user.email "$ACTION_EMAIL"
+      #     git config --local user.name "$ACTION_USERNAME"
+      #     commit_hash=`git show HEAD | egrep commit\ .+$ | cut -d' ' -f2`
+      #     git checkout development
+      #     git pull
+      #     git cherry-pick $commit_hash
+      #     git push