Skip to content

Commit ff0c97d

Browse files
authored
Merge pull request #571 from scratchfoundation/feat/canonical-add-repo-script
[UEPR-535] Combine add-repo.sh and CI generator scripts from #434 and #505
2 parents 99bb18a + 3fdfd68 commit ff0c97d

8 files changed

Lines changed: 907 additions & 865 deletions

File tree

.github/path-filters.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This file is generated by scripts/update-gha-workflows.ts
2+
#
3+
# To regenerate: npm run refresh-gh-workflow
4+
15
# The `&global` anchor defines a set of common paths to include by reference in the other filters.
26
global: &global
37
- ".github/path-filters.yml"
@@ -14,9 +18,6 @@ any-workspace:
1418
task-herder:
1519
- *global
1620
- "packages/task-herder/**"
17-
scratch-media-lib-scripts:
18-
- *global
19-
- "packages/scratch-media-lib-scripts/**"
2021
scratch-svg-renderer:
2122
- *global
2223
- "packages/scratch-svg-renderer/**"
@@ -35,3 +36,6 @@ scratch-gui:
3536
- "packages/scratch-render/**"
3637
- "packages/scratch-svg-renderer/**"
3738
- "packages/scratch-vm/**"
39+
scratch-media-lib-scripts:
40+
- *global
41+
- "packages/scratch-media-lib-scripts/**"

.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# build-monorepo.sh
2-
/monorepo.out
3-
/monorepo.tmp
4-
/monorepo.cache
1+
# add-repo.sh
2+
/add-repo.tmp
3+
/add-repo.errors.log
54

65
# Logs
76
logs

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
],
2525
"scripts": {
2626
"build": "cross-env NODE_ENV=production npm run --workspaces build",
27-
"build-monorepo": "cross-env-shell ./scripts/build-monorepo.sh",
2827
"clean": "npm run --workspaces clean",
2928
"prepare": "husky install",
30-
"refresh-gh-workflow": "ts-node scripts/build-gha-workflows.ts",
29+
"refresh-gh-workflow": "ts-node scripts/update-gha-workflows.ts",
3130
"start": "npm --workspace @scratch/scratch-gui start",
3231
"test": "npm test --workspaces",
3332
"update-legal": "npm --workspaces exec -c 'rm -f ./{LICENSE,TRADEMARK} && cp -f ../../{LICENSE,TRADEMARK} .'",

0 commit comments

Comments
 (0)