From 460d1e6835af122f86278b4b2f9c2e3b7bc91488 Mon Sep 17 00:00:00 2001
From: Erez Rokah <erezrokah@users.noreply.github.com>
Date: Thu, 23 Jul 2020 18:33:40 +0200
Subject: [PATCH] ci: pass token to checkout action to be set in git config
 (#4065)

---
 .github/workflows/publish.yml | 5 +++--
 package.json                  | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3a55330f..e2b1939c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -29,6 +29,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GIT_TOKEN }}
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
@@ -57,9 +59,8 @@ jobs:
       - name: Publish Netlify CMS
         uses: erezrokah/2fa-with-slack-action@v1.0.0
         env:
-          GIT_TOKEN: ${{ secrets.PUSH_TOKEN }}
           NPM_TOKEN: ${{secrets.NPM_TOKEN}}
           SLACK_TOKEN: ${{secrets.SLACK_TOKEN}}
           CONVERSATION_ID: ${{secrets.CONVERSATION_ID}}
-          PUBLISH_COMMAND: "yarn\npublish:ci:github"
+          PUBLISH_COMMAND: "yarn\npublish:ci"
           CODE_PATTERN: 'Enter OTP'
diff --git a/package.json b/package.json
index 5469d790..4dbd30d3 100644
--- a/package.json
+++ b/package.json
@@ -41,14 +41,12 @@
     "format:prettier": "prettier \"{{packages,scripts,website}/**/,}*.{js,jsx,ts,tsx,css}\"",
     "publish": "run-s publish:before-manual-version publish:after-manual-version",
     "publish:ci": "run-s publish:prepare \"publish:version --yes\" build publish:push-git \"publish:from-git --yes\"",
-    "publish:ci:github": "run-s publish:prepare \"publish:version --yes\" build publish:push-git:ci \"publish:from-git --yes\"",
     "publish:before-manual-version": "run-s publish:prepare publish:version",
     "publish:after-manual-version": "run-s build publish:push",
     "publish:prepare": "run-s bootstrap test",
     "publish:version": "lerna version --no-push",
     "publish:push": "run-s publish:push-git publish:from-git",
     "publish:push-git": "git push --follow-tags",
-    "publish:push-git:ci": "git push \"https://$GITHUB_ACTOR:$GIT_TOKEN@github.com/$GITHUB_REPOSITORY.git\" --follow-tags",
     "publish:from-git": "lerna publish from-git --pre-dist-tag beta",
     "publish:dry-run": "run-s \"publish:version --no-git-tag-version\"",
     "publish:prerelease": "run-s publish:prerelease:before-manual-version publish:after-manual-version",