use pure git in merge-upstream workflow
@@ -11,10 +11,9 @@ jobs:
uses: actions/checkout@v2
with:
ref: ${{ github.event.client_payload.stage }}
+
- name: Merge Upstream (@${{ github.event.client_payload.stage }})
- uses: exions/merge-upstream@v1
- with:
- upstream: matter-labs/zksync-dev
- upstream-branch: ${{ github.event.client_payload.stage }}
- branch: ${{ github.event.client_payload.stage }}
- token: ${{ secrets.GH_TOKEN }}
+ - run: |
+ git remote add upstream https://${{ secrets.GH_USER }}:${{ secrets.GH_TOKEN }}@github.com/matter-labs/zksync-dev.git
+ git fetch upstream ${{ github.event.client_payload.stage }}
+ git merge --ff-only upstream ${{ github.event.client_payload.stage }}
