diff --git a/.github/.keepalive b/.github/.keepalive index 67fbb38..08f97a4 100644 --- a/.github/.keepalive +++ b/.github/.keepalive @@ -1 +1 @@ -2022-11-01T01:20:20.031Z +2022-11-03T21:52:54.535Z diff --git a/.github/workflows/productionize.yml b/.github/workflows/productionize.yml index 9113bfe..37ddb4f 100644 --- a/.github/workflows/productionize.yml +++ b/.github/workflows/productionize.yml @@ -219,6 +219,13 @@ jobs: git config merge.theirs.driver 'cat %B > %A' GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories + # Copy files from `production` branch if necessary: + git checkout origin/production -- . + if [ -n "$(git status --porcelain)" ]; then + git add -A + git commit -m "Auto-generated commit" + fi + # If `deno` does not exist, create `deno` branch: - name: 'If `deno` does not exist, create `deno` branch' if: ${{ steps.deno-branch-exists.outputs.remote-exists == false }} @@ -385,6 +392,13 @@ jobs: git config merge.theirs.driver 'cat %B > %A' GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories + # Copy files from `production` branch if necessary: + git checkout origin/production -- . + if [ -n "$(git status --porcelain)" ]; then + git add -A + git commit -m "Auto-generated commit" + fi + # If `umd` does not exist, create `umd` branch: - name: 'If `umd` does not exist, create `umd` branch' if: ${{ steps.umd-branch-exists.outputs.remote-exists == false }} @@ -549,6 +563,13 @@ jobs: git config merge.theirs.driver 'cat %B > %A' GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories + # Copy files from `production` branch if necessary: + git checkout origin/production -- . + if [ -n "$(git status --porcelain)" ]; then + git add -A + git commit -m "Auto-generated commit" + fi + # If `esm` does not exist, create `esm` branch: - name: 'If `esm` does not exist, create `esm` branch' if: ${{ steps.esm-branch-exists.outputs.remote-exists == false }}