Skip to content

Commit 5e34b5d

Browse files
BenHenningBenHenning
committed
Merge branch 'main' into test-a11y-plugin-changes-v2
Conflicts: src/index.ts
2 parents bc58820 + 85378e5 commit 5e34b5d

26 files changed

+873
-406
lines changed

‎.github/ISSUE_TEMPLATE/documentation.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Report a documentation problem 📖
2+
description: Could our documentation be better? Tell us how.
3+
labels: 'issue: docs, issue: triage'
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: >
8+
Thanks for helping us improve our developer site documentation!
9+
Use this template to describe issues with the content on our
10+
[developer site](https://developers.google.com/blockly/guides).
11+
- type: input
12+
id: link
13+
attributes:
14+
label: Location
15+
description: >
16+
A link to the page with the documentation you want us to be updated.
17+
If no page exists, describe what the page should be, and where.
18+
- type: checkboxes
19+
id: type
20+
attributes:
21+
label: Type
22+
description: What kind of content is it?
23+
options:
24+
- label: Text
25+
- label: Image or Gif
26+
- label: Other
27+
- type: textarea
28+
id: content
29+
attributes:
30+
label: Suggested content
31+
description: Your suggestion for improved documentation. If it's helpful, also include the old content for comparison.
32+
validations:
33+
required: true
34+
- type: textarea
35+
id: context
36+
attributes:
37+
label: Additional context
38+
description: Add any other context about the problem. If this is related to a specific pull request, link to it.

‎.github/ISSUE_TEMPLATE/fancy_bug_report.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Report a bug 🐛
2+
description: Report bugs in Blockly, so we can fix them.
3+
labels: 'issue: bug, issue: triage'
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: >
8+
Thank you for taking the time to fill out a bug report!
9+
If you have a question about how to use Blockly in your application,
10+
please ask on the [forum](https://groups.google.com/forum/#!forum/blockly) instead of filing an issue.
11+
- type: checkboxes
12+
id: duplicates
13+
attributes:
14+
label: Check for duplicates
15+
options:
16+
- label: I have searched for similar issues before opening a new one.
17+
- type: textarea
18+
id: description
19+
attributes:
20+
label: Description
21+
description: Please provide a clear and concise description of the bug.
22+
placeholder: What happened? What did you expect to happen?
23+
validations:
24+
required: true
25+
- type: textarea
26+
id: repro
27+
attributes:
28+
label: Reproduction steps
29+
description: What steps should we take to reproduce the issue?
30+
value: |
31+
1.
32+
2.
33+
3.
34+
- type: textarea
35+
id: stack-trace
36+
attributes:
37+
label: Stack trace
38+
description: If you saw an error message or stack trace, please include it here.
39+
placeholder: The text in this section will be formatted automatically; no need to include backticks.
40+
render: shell
41+
- type: textarea
42+
id: screenshots
43+
attributes:
44+
label: Screenshots
45+
description: Screenshots can help us see the behavior you're describing. Please add a screenshot or gif, especially if you are describing a rendering or visual bug.
46+
placeholder: Paste or drag-and-drop an image to upload it.
47+
- type: dropdown
48+
id: browsers
49+
attributes:
50+
label: Browsers
51+
description: Please select all browsers you've observed this behavior on. If the bug isn't browser-specific, you can leave this blank.
52+
multiple: true
53+
options:
54+
- Chrome desktop
55+
- Safari desktop
56+
- Firefox desktop
57+
- Android mobile
58+
- iOS mobile

‎.github/ISSUE_TEMPLATE/feature_request.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Make a feature request ✨
2+
description: Suggest an idea to make Blockly better.
3+
labels: 'issue: feature request, issue: triage'
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: >
8+
Thank you for taking the time to fill out a feature request!
9+
If you have a question about how to use Blockly in your application,
10+
please ask on the [forum](https://groups.google.com/forum/#!forum/blockly) instead of filing an issue.
11+
- type: checkboxes
12+
id: duplicates
13+
attributes:
14+
label: Check for duplicates
15+
options:
16+
- label: I have searched for similar issues before opening a new one.
17+
- type: textarea
18+
id: problem
19+
attributes:
20+
label: Problem
21+
description: Is your feature request related to a problem? Please describe.
22+
placeholder: I'm always frustrated when...
23+
- type: textarea
24+
id: request
25+
attributes:
26+
label: Request
27+
description: Describe your feature request and how it solves your problem.
28+
validations:
29+
required: true
30+
- type: textarea
31+
id: alternatives
32+
attributes:
33+
label: Alternatives considered
34+
description: Describe any alternative solutions or features you've considered.
35+
- type: textarea
36+
id: context
37+
attributes:
38+
label: Additional context
39+
description: Add any other context or screenshots about the feature request here.

‎.github/workflows/build.yml‎

Lines changed: 102 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,114 @@
1-
# Build workflow
2-
name: Build
1+
# Build & lint checks workflow
2+
name: Build & Lint Checks
33

4-
on: [pull_request, workflow_dispatch]
4+
on:
5+
workflow_dispatch:
6+
pull_request:
7+
push:
8+
branches:
9+
- main
510

611
permissions:
712
contents: read
813

914
jobs:
15+
build_tip_of_tree_v12:
16+
name: Build test (against tip-of-tree core v12)
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout experimentation plugin
20+
uses: actions/checkout@v4
21+
with:
22+
path: main
23+
24+
- name: Checkout core Blockly
25+
uses: actions/checkout@v4
26+
with:
27+
repository: 'google/blockly'
28+
ref: 'rc/v12.0.0'
29+
path: core-blockly
30+
31+
- name: Use Node.js 20.x
32+
uses: actions/setup-node@v4
33+
with:
34+
node-version: 20.x
35+
36+
- name: NPM install
37+
run: |
38+
cd main
39+
npm install
40+
cd ..
41+
cd core-blockly
42+
npm install
43+
cd ..
44+
45+
- name: Link latest Blockly v12
46+
run: |
47+
cd core-blockly
48+
npm run package
49+
cd dist
50+
npm link
51+
cd ../../main
52+
npm link blockly
53+
cd ..
54+
55+
- name: Verify build
56+
run: |
57+
cd main
58+
npm run build
59+
1060
build:
61+
name: Build test (against pinned v12)
62+
# Don't run pinned version checks for PRs.
63+
if: ${{ !github.base_ref }}
1164
runs-on: ubuntu-latest
1265
steps:
13-
- name: Checkout
66+
- name: Checkout experimentation plugin
1467
uses: actions/checkout@v4
15-
- name: Setup Node
68+
69+
- name: Use Node.js 20.x
1670
uses: actions/setup-node@v4
1771
with:
18-
node-version: latest
19-
cache: 'npm'
20-
- run: npm ci
21-
- run: npm run build
22-
- run: npm run lint
72+
node-version: 20.x
73+
74+
- name: NPM install
75+
run: npm install
76+
77+
- name: Verify build
78+
run: npm run build
79+
80+
lint:
81+
name: Eslint check
82+
timeout-minutes: 5
83+
runs-on: ubuntu-latest
84+
steps:
85+
- uses: actions/checkout@v4
86+
87+
- name: Use Node.js 20.x
88+
uses: actions/setup-node@v4
89+
with:
90+
node-version: 20.x
91+
92+
- name: NPM install
93+
run: npm install
94+
95+
- name: Eslint check format
96+
run: npm run lint
97+
98+
format:
99+
name: Prettier check
100+
timeout-minutes: 5
101+
runs-on: ubuntu-latest
102+
steps:
103+
- uses: actions/checkout@v4
104+
105+
- name: Use Node.js 20.x
106+
uses: actions/setup-node@v4
107+
with:
108+
node-version: 20.x
109+
110+
- name: NPM install
111+
run: npm install
112+
113+
- name: Prettier check format
114+
run: npm run format:check

‎.github/workflows/test.yml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# Workflow for running automated tests.
2+
3+
name: Automated Tests
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
push:
9+
branches:
10+
- main
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
webdriverio_tests_tip_of_tree_v12:
17+
name: WebdriverIO tests (against tip-of-tree core v12)
18+
timeout-minutes: 10
19+
runs-on: ${{ matrix.os }}
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
os: [ubuntu-latest, macos-latest]
25+
26+
steps:
27+
- name: Checkout experimentation plugin
28+
uses: actions/checkout@v4
29+
with:
30+
path: main
31+
32+
- name: Checkout core Blockly
33+
uses: actions/checkout@v4
34+
with:
35+
repository: 'google/blockly'
36+
ref: 'rc/v12.0.0'
37+
path: core-blockly
38+
39+
- name: Use Node.js 20.x
40+
uses: actions/setup-node@v4
41+
with:
42+
node-version: 20.x
43+
44+
- name: NPM install
45+
run: |
46+
cd main
47+
npm install
48+
cd ..
49+
cd core-blockly
50+
npm install
51+
cd ..
52+
53+
- name: Link latest Blockly v12
54+
run: |
55+
cd core-blockly
56+
npm run package
57+
cd dist
58+
npm link
59+
cd ../../main
60+
npm link blockly
61+
cd ..
62+
63+
- name: Run tests
64+
run: |
65+
cd main
66+
npm run test
67+
68+
webdriverio_tests:
69+
name: WebdriverIO tests (against pinned v12)
70+
# Don't run pinned version checks for PRs.
71+
if: ${{ !github.base_ref }}
72+
timeout-minutes: 10
73+
runs-on: ${{ matrix.os }}
74+
75+
strategy:
76+
fail-fast: false
77+
matrix:
78+
os: [ubuntu-latest, macos-latest]
79+
80+
steps:
81+
- name: Checkout experimentation plugin
82+
uses: actions/checkout@v4
83+
84+
- name: Use Node.js 20.x
85+
uses: actions/setup-node@v4
86+
with:
87+
node-version: 20.x
88+
89+
- name: NPM install
90+
run: npm install
91+
92+
- name: Run tests
93+
run: npm run test

0 commit comments

Comments
 (0)