update workflows

.github/workflows/merge-upstream.yml

@@ -2,21 +2,24 @@ name: Merge upstream
 
 on:
   workflow_dispatch: {}
-  schedule:
-    - cron: '0 10 * * *'
+  repository_dispatch:
+    types: [update]
+    # client_payload: { ref: string }
+
+concurrency:
+  group: merge-${{ github.event.client_payload.ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  update:
+  merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
-        env:
-          GITHUB_TOKEN: ${{github.token}}
       - uses: actions/checkout@v2
         with:
-          ref: upstream-patched
           fetch-depth: 0
-          ssh-key: ${{secrets.DEPLOY_KEY}}
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
       - run: bash scripts/upgradeable/git-user-config.sh
       - run: bash scripts/upgradeable/merge-upstream.sh
+        env:
+          REF: ${{ github.event.client_payload.ref || github.ref}}
       - run: git push

.github/workflows/transpile.yml

@@ -3,20 +3,23 @@ name: Transpile
 on:
   workflow_dispatch: {}
   push:
-    branches: [upstream-patched]
+    branches: [patched/*]
+
+concurrency:
+  group: transpile
+  cancel-in-progress: true
 
 jobs:
   transpile:
     runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/heads/patched/')
     steps:
-      - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
-        env:
-          GITHUB_TOKEN: ${{github.token}}
+      - run: echo ::set-output name="${GITHUB_REF#refs/heads/patched/}"
+        id: branch
       - uses: actions/checkout@v2
         with:
-          ref: upstream-patched
           fetch-depth: 0
-          ssh-key: ${{secrets.DEPLOY_KEY}}
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
       - uses: actions/setup-node@v1
         with:
           node-version: 12.x
@@ -29,5 +32,5 @@ jobs:
       - run: npm ci
         if: steps.cache.outputs.cache-hit != 'true'
       - run: bash scripts/upgradeable/git-user-config.sh
-      - run: bash scripts/upgradeable/transpile-onto.sh master origin/master
-      - run: git push origin master
+      - run: bash scripts/upgradeable/transpile-onto.sh ${{ steps.branch.outputs.name }} origin/${{ steps.branch.outputs.name }}
+      - run: git push origin ${{ steps.branch.outputs.name }}

scripts/upgradeable/merge-upstream.sh

 #!/usr/bin/env bash
 
-set -euo pipefail -x
+set -euo pipefail
 
-git fetch 'https://github.com/OpenZeppelin/openzeppelin-contracts.git'
-git merge FETCH_HEAD -m 'Merge upstream openzeppelin-contracts into upstream-patched'
+: "${REF:="$(git rev-parse --symbolic-full-name HEAD)"}"
+
+if [[ "$REF" != refs/heads/* ]]; then
+  echo "$REF is not a branch" >&2
+  exit 1
+elif [[ "$REF" == refs/heads/patches ]]; then
+  echo "Run on a different branch" >&2
+  exit 1
+fi
+
+set -x
+
+input="${REF#refs/heads/}"
+upstream="${input#patched/}"
+branch="patched/$upstream"
+
+git checkout "$branch" 2>/dev/null || git checkout -b "$branch" patches
+git fetch 'https://github.com/OpenZeppelin/openzeppelin-contracts.git' "$upstream"
+git merge patches FETCH_HEAD -m "Merge upstream $upstream into $branch"