Skip to content

Commit 2308da8

Browse files
release: v10.2.0
Merge pull request #7542 from google/rc/v10.2.0
2 parents e459984 + f8bd6be commit 2308da8

508 files changed

Lines changed: 5499 additions & 18165 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Bug Report
2-
description: Create a report to help us improve
1+
name: Report a bug 🐛
2+
description: Report bugs in Blockly, so we can fix them.
33
labels: 'issue: bug, issue: triage'
44
body:
55
- type: markdown

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
contact_links:
2-
- name: Blockly Forum
2+
- name: Ask a question ❓
33
url: https://groups.google.com/forum/#!forum/blockly
4-
about: The Blockly developer forum, where you can ask and answer questions.
5-
- name: Plugins and examples
4+
about: Go to the Blockly developer forum, where you can ask and answer questions.
5+
- name: Report issues with plugins and examples 🧩
66
url: https://github.com/google/blockly-samples/issues/new/choose
77
about: File bugs or feature requests about plugins and samples in our blockly-samples repository.

.github/ISSUE_TEMPLATE/documentation.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Documentation
2-
description: Report an issue with our documentation
1+
name: Report a documentation problem 📖
2+
description: Could our documentation be better? Tell us how.
33
labels: 'issue: docs, issue: triage'
44
body:
55
- type: markdown

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Feature request
2-
description: Suggest an idea for this project
1+
name: Make a feature request
2+
description: Suggest an idea to make Blockly better.
33
labels: 'issue: feature request, issue: triage'
44
body:
55
- type: markdown

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77

88
<!-- TODO: Verify the following, checking each box with an 'x' between the brackets: [x] -->
99

10-
- [ ] I branched from develop
11-
- [ ] My pull request is against develop
12-
- [ ] My code follows the [style guide](https://developers.google.com/blockly/guides/modify/web/style-guide)
13-
- [ ] I ran `npm run format` and `npm run lint`
10+
- [ ] I [validated my changes](https://developers.google.com/blockly/guides/contribute/core#making_and_verifying_a_change)
1411

1512
## The details
1613
### Resolves
@@ -22,14 +19,6 @@ Fixes
2219

2320
<!-- TODO: Describe what this Pull Request does. Include screenshots if applicable. -->
2421

25-
#### Behavior Before Change
26-
27-
<!--TODO: Image, gif or explanation of behavior before this pull request. -->
28-
29-
#### Behavior After Change
30-
31-
<!--TODO: Image, gif or explanation of behavior after this pull request. -->
32-
3322
### Reason for Changes
3423

3524
<!--TODO: Explain why these changes should be made. Include screenshots if applicable. -->

.github/workflows/appengine_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
# Checks-out the repository under $GITHUB_WORKSPACE.
1717
# When running manually this checks out the master branch.
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919

2020
- name: Prepare demo files
2121
# Install all dependencies, then copy all the files needed for demos.

.github/workflows/browser_test.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# https://nodejs.org/en/about/releases/
2525

2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
persist-credentials: false
3030

@@ -45,10 +45,6 @@ jobs:
4545
if: runner.os == 'Linux'
4646
run: source ./tests/scripts/setup_linux_env.sh
4747

48-
- name: MacOS Test Setup
49-
if: runner.os == 'macOS'
50-
run: source ./tests/scripts/setup_osx_env.sh
51-
5248
- name: Run Build
5349
run: npm run build
5450

.github/workflows/build.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
# https://nodejs.org/en/about/releases/
2424

2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
with:
2828
persist-credentials: false
2929

@@ -44,10 +44,6 @@ jobs:
4444
if: runner.os == 'Linux'
4545
run: source ./tests/scripts/setup_linux_env.sh
4646

47-
- name: MacOS Test Setup
48-
if: runner.os == 'macOS'
49-
run: source ./tests/scripts/setup_osx_env.sh
50-
5147
- name: Run
5248
run: npm run test
5349

@@ -58,7 +54,7 @@ jobs:
5854
timeout-minutes: 5
5955
runs-on: ubuntu-latest
6056
steps:
61-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
6258

6359
- name: Use Node.js 20.x
6460
uses: actions/setup-node@v3
@@ -75,7 +71,7 @@ jobs:
7571
timeout-minutes: 5
7672
runs-on: ubuntu-latest
7773
steps:
78-
- uses: actions/checkout@v3
74+
- uses: actions/checkout@v4
7975

8076
- name: Use Node.js 20.x
8177
uses: actions/setup-node@v3
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
on:
2+
pull_request_target:
3+
types:
4+
- opened
5+
name: Welcome new contributors
6+
jobs:
7+
welcome:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
pull-requests: write
11+
steps:
12+
- uses: actions/first-interaction@v1
13+
with:
14+
repo-token: ${{ secrets.GITHUB_TOKEN }}
15+
pr-message: >
16+
Welcome! It looks like this is your first pull request in Blockly,
17+
so here are a couple of tips:
18+
19+
- You can find tips about contributing to Blockly and how to
20+
validate your changes on our
21+
[developer site](https://developers.google.com/blockly/guides/contribute/core#making_and_verifying_a_change).
22+
23+
- All contributors must sign the Google Contributor License
24+
Agreement (CLA). If the google-cla bot leaves a comment on this
25+
PR, make sure you follow the instructions.
26+
27+
- We use [conventional commits](https://www.conventionalcommits.org/)
28+
to make versioning the package easier. Make sure your commit
29+
message is in the [proper format](https://developers.google.com/blockly/guides/contribute/get-started/commits)
30+
or [learn how to fix it](https://developers.google.com/blockly/guides/contribute/get-started/commits#fixing_non-conventional_commits).
31+
32+
- If any of the other checks on this PR fail, you can click on
33+
them to learn why. It might be that your change caused a test
34+
failure, or that you need to double-check the
35+
[style guide](https://developers.google.com/blockly/guides/contribute/core/style_guide).
36+
37+
Thank you for opening this PR! A member of the Blockly team will review it soon.

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Want to make Blockly better? We welcome contributions to Blockly in the form of
4242

4343
## Releases
4444

45-
We release by pushing the latest code to the master branch, followed by updating the npm package, our [docs](https://developers.google.com/blockly), and [demo pages](https://google.github.io/blockly-samples/). We typically release a new version of Blockly once a quarter (every 3 months). If there are breaking bugs, such as a crash when performing a standard action or a rendering issue that makes Blockly unusable, we will cherry-pick fixes to master between releases to fix them. The [releases page](https://github.com/google/blockly/releases) has a list of all releases.
45+
We release by pushing the latest code to the master branch, followed by updating the npm package, our [docs](https://developers.google.com/blockly), and [demo pages](https://google.github.io/blockly-samples/). If there are breaking bugs, such as a crash when performing a standard action or a rendering issue that makes Blockly unusable, we will cherry-pick fixes to master between releases to fix them. The [releases page](https://github.com/google/blockly/releases) has a list of all releases.
4646

4747
We use [semantic versioning](https://semver.org/). Releases that have breaking changes or are otherwise not backwards compatible will have a new major version. Patch versions are reserved for bug-fix patches between scheduled releases.
4848

@@ -72,15 +72,7 @@ Unreleased APIs may change radically. Anything that is in `develop` but not `mas
7272

7373
## Issues and Milestones
7474

75-
We typically triage all bugs within 2 working days, which includes adding any appropriate labels and assigning it to a milestone. Please keep in mind, we are a small team so even feature requests that everyone agrees on may not be prioritized.
76-
77-
### Milestones
78-
79-
**Upcoming release** - The upcoming release milestone is for all bugs we plan on fixing before the next release. This typically has the form of `year_quarter_release` (such as `2019_q2_release`). Some bugs will be added to this release when they are triaged, others may be added closer to a release.
80-
81-
**Bug Bash Backlog** - These are bugs that we're still prioritizing. They haven't been added to a specific release yet, but we'll consider them for each release depending on relative priority and available time.
82-
83-
**Icebox** - These are bugs that we do not intend to spend time on. They are either too much work or minor enough that we don't expect them to ever take priority. We are still happy to accept pull requests for these bugs.
75+
We typically triage all bugs within 1 week, which includes adding any appropriate labels and assigning it to a milestone. Please keep in mind, we are a small team so even feature requests that everyone agrees on may not be prioritized.
8476

8577
## Good to Know
8678

0 commit comments

Comments
 (0)