Skip to content

Commit 2aa4fb3

Browse files
committed
Merge remote-tracking branch 'upstream/integration-branch-ux-12.2024' into feature/uepr-38-add-debug-modal
2 parents 3c7f153 + 9d4e990 commit 2aa4fb3

File tree

7 files changed

+1573
-738
lines changed

7 files changed

+1573
-738
lines changed

.github/workflows/ci-cd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
NODE_ENV: production
5252
run: npm run build
5353
- name: Store Build Output
54-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
54+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
5555
with:
5656
name: build-output
5757
path: ./build
5858
- name: Store Dist Output
59-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
59+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
6060
with:
6161
name: dist-output
6262
path: ./dist
@@ -71,7 +71,7 @@ jobs:
7171
run: npm run test:integration -- --reporters="default" --reporters="jest-junit"
7272
- name: Store Test Results
7373
if: always() # Even if tests fail
74-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
74+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
7575
with:
7676
name: test-output
7777
path: ./test-results/* # Both unit and integration test results

CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,56 @@
33
All notable changes to this project will be documented in this file. See
44
[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [4.1.2](https://github.com/scratchfoundation/scratch-gui/compare/v4.1.1...v4.1.2) (2024-11-12)
7+
8+
9+
### Bug Fixes
10+
11+
* **deps:** lock file maintenance ([08346d5](https://github.com/scratchfoundation/scratch-gui/commit/08346d597c17396d79719c17c26cd9854503832f))
12+
13+
## [4.1.1](https://github.com/scratchfoundation/scratch-gui/compare/v4.1.0...v4.1.1) (2024-11-09)
14+
15+
16+
### Bug Fixes
17+
18+
* **deps:** lock file maintenance ([62f69aa](https://github.com/scratchfoundation/scratch-gui/commit/62f69aaa734a7342bcde4cd084d0cfcde168a540))
19+
20+
# [4.1.0](https://github.com/scratchfoundation/scratch-gui/compare/v4.0.45...v4.1.0) (2024-11-08)
21+
22+
23+
### Features
24+
25+
* [UEPR-44] added ability to stop project when playing ([3ede51f](https://github.com/scratchfoundation/scratch-gui/commit/3ede51f0f38e072093d31c3d24913ccd456e01be))
26+
* [UEPR-44] exported redux action and added additional class to tutorials button ([01f493f](https://github.com/scratchfoundation/scratch-gui/commit/01f493f4db34b9f0875657eda8accbd25bf70d6e))
27+
28+
## [4.0.45](https://github.com/scratchfoundation/scratch-gui/compare/v4.0.44...v4.0.45) (2024-11-07)
29+
30+
31+
### Bug Fixes
32+
33+
* **deps:** lock file maintenance ([e7cc56c](https://github.com/scratchfoundation/scratch-gui/commit/e7cc56c200af86add3982ad28d290d16df3d1802))
34+
35+
## [4.0.44](https://github.com/scratchfoundation/scratch-gui/compare/v4.0.43...v4.0.44) (2024-11-05)
36+
37+
38+
### Bug Fixes
39+
40+
* **deps:** lock file maintenance ([910199a](https://github.com/scratchfoundation/scratch-gui/commit/910199a11e3ec8f3b45c52bb4e27597459905938))
41+
42+
## [4.0.43](https://github.com/scratchfoundation/scratch-gui/compare/v4.0.42...v4.0.43) (2024-11-02)
43+
44+
45+
### Bug Fixes
46+
47+
* **deps:** lock file maintenance ([4293ed6](https://github.com/scratchfoundation/scratch-gui/commit/4293ed6ae9c53fa9a464734e17eee53d3f4de64e))
48+
49+
## [4.0.42](https://github.com/scratchfoundation/scratch-gui/compare/v4.0.41...v4.0.42) (2024-11-02)
50+
51+
52+
### Bug Fixes
53+
54+
* **deps:** update dependency scratch-l10n to v4 ([648ab47](https://github.com/scratchfoundation/scratch-gui/commit/648ab47d6b7a2cdc882a96f0d69e120635e04f7c))
55+
656
## [4.0.41](https://github.com/scratchfoundation/scratch-gui/compare/v4.0.40...v4.0.41) (2024-10-21)
757

858

0 commit comments

Comments
 (0)