Transpile c09cb459

.github/workflows/merge-upstream.yml

@@ -17,4 +17,4 @@ jobs:
           ref: upstream-patched
           fetch-depth: 0
           ssh-key: ${{secrets.DEPLOY_KEY}}
-      - run: bash -x scripts/merge-upstream.sh
+      - run: bash -x scripts/upgrade-safe/merge-upstream.sh

.github/workflows/test.yml

@@ -21,6 +21,6 @@ jobs:
           restore-keys: npm-v2-
       - run: npm ci
         if: steps.cache.outputs.cache-hit != 'true'
-      - run: bash scripts/transpile.sh
+      - run: bash scripts/upgrade-safe/transpile.sh
         if: github.ref != 'refs/heads/master'
       - run: npm run test

.github/workflows/transpile.yml

@@ -28,4 +28,5 @@ jobs:
           restore-keys: npm-v2-
       - run: npm ci
         if: steps.cache.outputs.cache-hit != 'true'
-      - run: bash scripts/transpile-push.sh
+      - run: bash scripts/upgrade-safe/transpile-branch.sh master origin/master
+      - run: git push origin master

scripts/transpile-push.sh

-#!/usr/bin/env bash
-
-set -euo pipefail -x
-
-bash scripts/transpile.sh
-
-git config user.name 'github-actions'
-git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
-
-COMMIT="$(git rev-parse --short HEAD)"
-
-git add contracts
-git checkout --orphan master
-git reset --soft origin/master
-if ! git diff --cached --quiet; then
-  git commit -m "Transpile $COMMIT"
-fi
-git push origin master

scripts/upgrade-safe/git-user-config.sh

+#!/usr/bin/env bash
+
+set -euo pipefail -x
+
+git config user.name 'github-actions'
+git config user.email '41898282+github-actions[bot]@users.noreply.github.com'

scripts/merge-upstream.sh → scripts/upgrade-safe/merge-upstream.sh

@@ -2,8 +2,8 @@
 
 set -euo pipefail -x
 
+bash scripts/upgrade-safe/git-user-config.sh
+
 git fetch 'https://github.com/OpenZeppelin/openzeppelin-contracts.git'
-git config user.name 'github-actions'
-git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
 git merge FETCH_HEAD -m 'Merge upstream openzeppelin-contracts into upstream-patched'
 git push

scripts/upgrade-safe/transpile-branch.sh

+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [ $# -lt 1 ]; then
+  echo "usage: bash $0 <branch> [base]" >&2
+  exit 1
+fi
+
+set -x
+
+branch="$1"
+base="${2:-}"
+
+bash scripts/upgrade-safe/transpile.sh
+bash scripts/upgrade-safe/git-user-config.sh
+
+commit="$(git rev-parse --short HEAD)"
+
+git add contracts
+git checkout --orphan "$branch"
+
+if [ -n "$base" ]; then
+  git reset --soft "$base"
+fi
+
+if ! git diff --cached --quiet; then
+  git commit -m "Transpile $commit"
+fi