@@ -202,13 +202,15 @@ jobs:
202202 run : |
203203 git checkout -b deno origin/deno
204204
205- find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs rm
206- find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs rm -rf
205+ find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs -r rm
206+ find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs -r rm -rf
207207
208208 git add -A
209- git commit -m "Remove files"
209+ git commit -m "Remove files" --allow-empty
210210
211- git merge -s recursive -X theirs origin/production --allow-unrelated-histories
211+ git config merge.theirs.name 'simulate `-s theirs`'
212+ git config merge.theirs.driver 'cat %B > %A'
213+ GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories
212214
213215 # If `deno` does not exist, create `deno` branch:
214216 - name : ' If `deno` does not exist, create `deno` branch'
@@ -292,8 +294,8 @@ jobs:
292294 # Delete everything in current directory aside from deno folder:
293295 - name : ' Delete everything in current directory aside from deno folder'
294296 run : |
295- find . -type 'f' | grep -v -e "deno" -e ".git/" | xargs rm
296- find . -mindepth 1 -type 'd' | grep -v -e "deno" -e ".git" | xargs rm -rf
297+ find . -type 'f' | grep -v -e "deno" -e ".git/" | xargs -r rm
298+ find . -mindepth 1 -type 'd' | grep -v -e "deno" -e ".git" | xargs -r rm -rf
297299
298300 # Move deno directory to root:
299301 - name : ' Move deno directory to root'
@@ -375,13 +377,15 @@ jobs:
375377 run : |
376378 git checkout -b umd origin/umd
377379
378- find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs rm
379- find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs rm -rf
380+ find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs -r rm
381+ find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs -r rm -rf
380382
381383 git add -A
382- git commit -m "Remove files"
384+ git commit -m "Remove files" --allow-empty
383385
384- git merge -s recursive -X theirs origin/production --allow-unrelated-histories
386+ git config merge.theirs.name 'simulate `-s theirs`'
387+ git config merge.theirs.driver 'cat %B > %A'
388+ GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories
385389
386390 # If `umd` does not exist, create `umd` branch:
387391 - name : ' If `umd` does not exist, create `umd` branch'
@@ -458,13 +462,13 @@ jobs:
458462 find ./umd -type f -name '*.md' -print0 | xargs -0 perl -0777 -i -pe "s/<script type=\"text\/javascript\">([\s\S]+?)<\/script>/<script type=\"text\/javascript\">\n\(function \(\) {\1}\)\(\);\n<\/script>/g"
459463
460464 # Create package.json file for umd branch:
461- jq --indent 2 '{"name": .name, "version": .version, "description": .description, "license": .license, "main": "./browser .js", "homepage": .homepage, "repository": .repository, "bugs": .bugs, "keywords": .keywords, "funding": .funding}' package.json > ./umd/package.json
465+ jq --indent 2 '{"name": .name, "version": .version, "description": .description, "license": .license, "main": "./index .js", "homepage": .homepage, "repository": .repository, "bugs": .bugs, "keywords": .keywords, "funding": .funding}' package.json > ./umd/package.json
462466
463467 # Delete everything in current directory aside from umd folder:
464468 - name : ' Delete everything in current directory aside from umd folder'
465469 run : |
466- find . -type 'f' | grep -v -e "umd" -e ".git/" | xargs rm
467- find . -mindepth 1 -type 'd' | grep -v -e "umd" -e ".git" | xargs rm -rf
470+ find . -type 'f' | grep -v -e "umd" -e ".git/" | xargs -r rm
471+ find . -mindepth 1 -type 'd' | grep -v -e "umd" -e ".git" | xargs -r rm -rf
468472
469473 # Move umd directory to root:
470474 - name : ' Move umd directory to root'
@@ -546,13 +550,15 @@ jobs:
546550 run : |
547551 git checkout -b esm origin/esm
548552
549- find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs rm
550- find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs rm -rf
553+ find . -type 'f' | grep -v -e ".git/" -e "package.json" -e "README.md" -e "LICENSE" -e "CONTRIBUTORS" -e "NOTICE" | xargs -r rm
554+ find . -mindepth 1 -type 'd' | grep -v -e ".git" | xargs -r rm -rf
551555
552556 git add -A
553- git commit -m "Remove files"
557+ git commit -m "Remove files" --allow-empty
554558
555- git merge -s recursive -X theirs origin/production --allow-unrelated-histories
559+ git config merge.theirs.name 'simulate `-s theirs`'
560+ git config merge.theirs.driver 'cat %B > %A'
561+ GIT_CONFIG_PARAMETERS="'merge.default=theirs'" git merge origin/production --allow-unrelated-histories
556562
557563 # If `esm` does not exist, create `esm` branch:
558564 - name : ' If `esm` does not exist, create `esm` branch'
@@ -640,8 +646,8 @@ jobs:
640646 # Delete everything in current directory aside from esm folder:
641647 - name : ' Delete everything in current directory aside from esm folder'
642648 run : |
643- find . -type 'f' | grep -v -e "esm" -e ".git/" | xargs rm
644- find . -mindepth 1 -type 'd' | grep -v -e "esm" -e ".git" | xargs rm -rf
649+ find . -type 'f' | grep -v -e "esm" -e ".git/" | xargs -r rm
650+ find . -mindepth 1 -type 'd' | grep -v -e "esm" -e ".git" | xargs -r rm -rf
645651
646652 # Move esm directory to root:
647653 - name : ' Move esm directory to root'
0 commit comments