Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into merge_upstream_3…
Browse files Browse the repository at this point in the history
…1102024
  • Loading branch information
AndreyNikitin committed Nov 4, 2024
2 parents de70846 + 799682b commit d223c9c
Show file tree
Hide file tree
Showing 42 changed files with 15,374 additions and 35,465 deletions.
7 changes: 7 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# See https://scratch.mit.edu/faq
Chrome >= 63
Edge >= 15
Firefox >= 57
Safari >= 11
Android >= 63
iOS >= 11
1 change: 1 addition & 0 deletions .github/CODEOWNERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@scratchfoundation/scratch-engineering
9 changes: 5 additions & 4 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
if: github.event_name == 'pull_request'
- uses: actions/setup-node@v3
with:
node-version: '16'
cache: 'npm'
node-version-file: ".nvmrc"
- name: Info
run: |
cat <<EOF
Expand All @@ -36,9 +36,10 @@ jobs:
GitHub head ref: ${{ github.head_ref }}
EOF
- name: Setup
run: npm ci
- run: npm run build
- run: npm test
run: |
npm ci
npm run build
npm test
- uses: JS-DevTools/npm-publish@v3
if: github.ref_name == 'develop'
with:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Lint commit messages
on: [pull_request]

concurrency:
group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.sha }}"

jobs:
commitlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: wagoid/commitlint-github-action@5ce82f5d814d4010519d15f0552aec4f17a1e1fe # v5
1 change: 1 addition & 0 deletions .husky/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text eol=lf
4 changes: 4 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v16
Loading

0 comments on commit d223c9c

Please sign in to comment.