Skip to content

Commit df2bb85

Browse files
author
Sarah Otts
authored
Merge branch 'develop' into arabic-animate-name
2 parents c879d6e + 3eac4ff commit df2bb85

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

.circleci/config.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
steps:
5050
- *restore_git_cache
5151
- checkout
52-
- *restore_npm_cache
5352
- run: npm ci
5453
- *save_git_cache
5554
- *save_npm_cache
@@ -205,9 +204,21 @@ workflows:
205204
- store_build:
206205
requires:
207206
- build
207+
filters:
208+
branches:
209+
only:
210+
- master
211+
- develop
212+
- /^hotfix\/.*/
208213
- store_dist:
209214
requires:
210215
- build
216+
filters:
217+
branches:
218+
only:
219+
- master
220+
- develop
221+
- /^hotfix\/.*/
211222
- deploy-npm:
212223
requires:
213224
- lint

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@
7575
"redux-throttle": "0.1.1",
7676
"scratch-audio": "0.1.0-prerelease.20200528195344",
7777
"scratch-blocks": "0.1.0-prerelease.20211110095305",
78-
"scratch-l10n": "3.14.20211210031511",
78+
"scratch-l10n": "3.14.20211216031518",
7979
"scratch-paint": "0.2.0-prerelease.20211027080909",
8080
"scratch-render": "0.1.0-prerelease.20211028200436",
8181
"scratch-render-fonts": "1.0.0-prerelease.20210401210003",
8282
"scratch-storage": "1.3.5",
8383
"scratch-svg-renderer": "0.2.0-prerelease.20210727023023",
84-
"scratch-vm": "0.2.0-prerelease.20211210053720",
84+
"scratch-vm": "0.2.0-prerelease.20211216081552",
8585
"startaudiocontext": "1.2.1",
8686
"style-loader": "^0.23.0",
8787
"text-encoding": "0.7.0",

0 commit comments

Comments
 (0)