Slight refactoring

.ci/retrofit-worktree.sh

@@ -7,18 +7,7 @@ fi
 WORKTREE_NAME="$1"
 WORKTREE_DIRECTORY="$2"
 
-export GIT_AUTHOR_NAME="ci-sage workflow"
-export GIT_AUTHOR_EMAIL="[email protected]"
-export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
-export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
-
-set -e
-
-# Set globally for other parts of the workflow
-git config --global user.name "$GIT_AUTHOR_NAME"
-git config --global user.email "$GIT_AUTHOR_EMAIL"
-
-set -x
+set -ex
 
 # If actions/checkout downloaded our source tree (in current directory) using the
 # GitHub REST API instead of with git, we first make the source tree a repo.

.ci/write-dockerfile.sh

@@ -288,6 +288,12 @@ FROM with-system-packages AS bootstrapped
 RUN rm -rf /source-tree
 $ADD . /source-tree
 RUN <<EOT
+export GIT_AUTHOR_NAME="ci-sage workflow"
+export GIT_AUTHOR_EMAIL="[email protected]"
+export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
+export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
+git config --global user.name "$GIT_AUTHOR_NAME"
+git config --global user.email "$GIT_AUTHOR_EMAIL"
 rm -rf /source-tree/.git
 if [ -d /sage ]; then
   BASE_VERSION=\$(cat /sage/VERSION.txt)