Skip to content

Commit 52660a2

Browse files
committed
Merge remote-tracking branch 'upstream/master' into doc-ja
# Conflicts: # lib/tinyusb
2 parents d502e5b + 3f796b6 commit 52660a2

File tree

285 files changed

+6593
-1673
lines changed

Some content is hidden

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

285 files changed

+6593
-1673
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# These should also not be modified by git.
1919
tests/basics/string_cr_conversion.py -text
2020
tests/basics/string_crlf_conversion.py -text
21+
tests/micropython/test_normalize_newlines.py.exp -text
2122
ports/stm32/pybcdc.inf_template -text
2223
ports/stm32/usbhost/** -text
2324
ports/cc3200/hal/aes.c -text

.github/workflows/biome.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v5
10+
uses: actions/checkout@v6
1111
- name: Setup Biome
1212
uses: biomejs/setup-biome@v2
1313
with:

.github/workflows/code_formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
code-formatting:
1111
runs-on: ubuntu-22.04
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
- uses: actions/setup-python@v6
1515
- name: Install packages
1616
run: tools/ci.sh c_code_formatting_setup

.github/workflows/code_size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build:
2626
runs-on: ubuntu-22.04
2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
with:
3030
fetch-depth: 100
3131
- name: Install packages

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
codespell:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v5
9+
- uses: actions/checkout@v6
1010
# codespell version should be kept in sync with .pre-commit-config.yml
1111
- run: pip install --user codespell==2.4.1 tomli
1212
- run: codespell

.github/workflows/commit_formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
with:
1515
fetch-depth: 100
1616
- uses: actions/setup-python@v6

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- uses: actions/setup-python@v6
2222
- name: Install Python packages
2323
run: pip install -r docs/requirements.txt

.github/workflows/examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
embedding:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
- name: Build
2323
run: make -C examples/embedding -f micropython_embed.mk && make -C examples/embedding
2424
- name: Run

.github/workflows/mpremote.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
with:
1616
# Setting this to zero means fetch all history and tags,
1717
# which hatch-vcs can use to discover the version tag.

.github/workflows/mpy_format.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
paths:
77
- '.github/workflows/*.yml'
88
- 'examples/**'
9+
- 'mpy-cross/**'
10+
- 'py/**'
911
- 'tests/**'
1012
- 'tools/**'
1113

@@ -17,8 +19,10 @@ jobs:
1719
test:
1820
runs-on: ubuntu-latest
1921
steps:
20-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2123
- name: Install packages
2224
run: tools/ci.sh mpy_format_setup
2325
- name: Test mpy-tool.py
2426
run: tools/ci.sh mpy_format_test
27+
- name: Test mpy-cross debug emitter
28+
run: tools/ci.sh mpy_cross_debug_emitter

0 commit comments

Comments
 (0)