diff --git a/.github/.keepalive b/.github/.keepalive deleted file mode 100644 index a9b3a3a..0000000 --- a/.github/.keepalive +++ /dev/null @@ -1 +0,0 @@ -2022-07-01T01:04:40.684Z diff --git a/.github/workflows/productionize.yml b/.github/workflows/productionize.yml index 128c22e..6726965 100644 --- a/.github/workflows/productionize.yml +++ b/.github/workflows/productionize.yml @@ -202,13 +202,15 @@ jobs: run: | git checkout -b deno origin/deno - find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs rm - find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs rm -rf + find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs -r rm + find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs -r rm -rf git add -A - git commit -m "Remove files" + git commit -m "Remove files" --allow-empty - git merge -s recursive -X theirs origin/production --allow-unrelated-histories + git config merge.theirs.name 'simulate `-s theirs`' + git config merge.theirs.driver 'cat %B > %A' + GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories # If `deno` does not exist, create `deno` branch: - name: 'If `deno` does not exist, create `deno` branch' @@ -292,8 +294,8 @@ jobs: # Delete everything in current directory aside from deno folder: - name: 'Delete everything in current directory aside from deno folder' run: | - find . -type 'f' | grep -v -e "deno" -e ".git/" | xargs rm - find . -mindepth 1 -type 'd' | grep -v -e "deno" -e ".git" | xargs rm -rf + find . -type 'f' | grep -v -e "deno" -e ".git/" | xargs -r rm + find . -mindepth 1 -type 'd' | grep -v -e "deno" -e ".git" | xargs -r rm -rf # Move deno directory to root: - name: 'Move deno directory to root' @@ -375,13 +377,15 @@ jobs: run: | git checkout -b umd origin/umd - find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs rm - find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs rm -rf + find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs -r rm + find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs -r rm -rf git add -A - git commit -m "Remove files" + git commit -m "Remove files" --allow-empty - git merge -s recursive -X theirs origin/production --allow-unrelated-histories + git config merge.theirs.name 'simulate `-s theirs`' + git config merge.theirs.driver 'cat %B > %A' + GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories # If `umd` does not exist, create `umd` branch: - name: 'If `umd` does not exist, create `umd` branch' @@ -458,13 +462,13 @@ jobs: find ./umd -type f -name '*.md' -print0 | xargs -0 perl -0777 -i -pe "s/