@@ -202,13 +202,15 @@ jobs:
|
202 | 202 | run: |
|
203 | 203 | git checkout -b deno origin/deno
|
204 | 204 |
|
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 |
207 | 207 |
|
208 | 208 | git add -A
|
209 |
| -git commit -m "Remove files" |
| 209 | +git commit -m "Remove files" --allow-empty |
210 | 210 |
|
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 |
212 | 214 |
|
213 | 215 | # If `deno` does not exist, create `deno` branch:
|
214 | 216 | - name: 'If `deno` does not exist, create `deno` branch'
|
@@ -292,8 +294,8 @@ jobs:
|
292 | 294 | # Delete everything in current directory aside from deno folder:
|
293 | 295 | - name: 'Delete everything in current directory aside from deno folder'
|
294 | 296 | 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 |
297 | 299 |
|
298 | 300 | # Move deno directory to root:
|
299 | 301 | - name: 'Move deno directory to root'
|
@@ -375,13 +377,15 @@ jobs:
|
375 | 377 | run: |
|
376 | 378 | git checkout -b umd origin/umd
|
377 | 379 |
|
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 |
380 | 382 |
|
381 | 383 | git add -A
|
382 |
| -git commit -m "Remove files" |
| 384 | +git commit -m "Remove files" --allow-empty |
383 | 385 |
|
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 |
385 | 389 |
|
386 | 390 | # If `umd` does not exist, create `umd` branch:
|
387 | 391 | - name: 'If `umd` does not exist, create `umd` branch'
|
@@ -458,13 +462,13 @@ jobs:
|
458 | 462 | 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"
|
459 | 463 |
|
460 | 464 | # 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 |
462 | 466 |
|
463 | 467 | # Delete everything in current directory aside from umd folder:
|
464 | 468 | - name: 'Delete everything in current directory aside from umd folder'
|
465 | 469 | 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 |
468 | 472 |
|
469 | 473 | # Move umd directory to root:
|
470 | 474 | - name: 'Move umd directory to root'
|
@@ -546,13 +550,15 @@ jobs:
|
546 | 550 | run: |
|
547 | 551 | git checkout -b esm origin/esm
|
548 | 552 |
|
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 |
551 | 555 |
|
552 | 556 | git add -A
|
553 |
| -git commit -m "Remove files" |
| 557 | +git commit -m "Remove files" --allow-empty |
554 | 558 |
|
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 |
556 | 562 |
|
557 | 563 | # If `esm` does not exist, create `esm` branch:
|
558 | 564 | - name: 'If `esm` does not exist, create `esm` branch'
|
@@ -640,8 +646,8 @@ jobs:
|
640 | 646 | # Delete everything in current directory aside from esm folder:
|
641 | 647 | - name: 'Delete everything in current directory aside from esm folder'
|
642 | 648 | 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 |
645 | 651 |
|
646 | 652 | # Move esm directory to root:
|
647 | 653 | - name: 'Move esm directory to root'
|
|
0 commit comments