Skip to content

Commit 9170d12

Browse files
authored
Merge branch 'meshtastic:master' into master
2 parents d034785 + 376dc7e commit 9170d12

File tree

116 files changed

+1509
-709
lines changed

Some content is hidden

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

116 files changed

+1509
-709
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
22
# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
33
# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
4-
FROM mcr.microsoft.com/devcontainers/cpp:2-debian-12
4+
FROM mcr.microsoft.com/devcontainers/cpp:2-debian-13
55

66
USER root
77

.github/actions/setup-base/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
using: composite
66
steps:
77
- name: Checkout code
8-
uses: actions/checkout@v5
8+
uses: actions/checkout@v6
99
with:
1010
submodules: recursive
1111
ref: ${{github.event.pull_request.head.ref}}

.github/workflows/build_debian_src.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-24.04
2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828
with:
2929
submodules: recursive
3030
path: meshtasticd

.github/workflows/build_firmware.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
outputs:
2323
artifact-id: ${{ steps.upload.outputs.artifact-id }}
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
with:
2727
submodules: recursive
2828
ref: ${{github.event.pull_request.head.ref}}

.github/workflows/build_one_arch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
setup:
2727
runs-on: ubuntu-24.04
2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
- uses: actions/setup-python@v6
3131
with:
3232
python-version: 3.x
@@ -44,7 +44,7 @@ jobs:
4444
version:
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/checkout@v5
47+
- uses: actions/checkout@v6
4848
- name: Get release version string
4949
run: |
5050
echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
@@ -108,7 +108,7 @@ jobs:
108108
needs: [version, build]
109109
steps:
110110
- name: Checkout code
111-
uses: actions/checkout@v5
111+
uses: actions/checkout@v6
112112
with:
113113
ref: ${{github.event.pull_request.head.ref}}
114114
repository: ${{github.event.pull_request.head.repo.full_name}}

.github/workflows/build_one_target.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
runs-on: ubuntu-24.04
4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
- uses: actions/setup-python@v6
5050
with:
5151
python-version: 3.x
@@ -66,7 +66,7 @@ jobs:
6666
if: ${{ inputs.target != '' }}
6767
runs-on: ubuntu-latest
6868
steps:
69-
- uses: actions/checkout@v5
69+
- uses: actions/checkout@v6
7070
- name: Get release version string
7171
run: |
7272
echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
@@ -114,7 +114,7 @@ jobs:
114114
needs: [version, build]
115115
steps:
116116
- name: Checkout code
117-
uses: actions/checkout@v5
117+
uses: actions/checkout@v6
118118
with:
119119
ref: ${{github.event.pull_request.head.ref}}
120120
repository: ${{github.event.pull_request.head.repo.full_name}}

.github/workflows/docker_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ${{ inputs.runs-on }}
4848
steps:
4949
- name: Checkout code
50-
uses: actions/checkout@v5
50+
uses: actions/checkout@v6
5151
with:
5252
submodules: recursive
5353
ref: ${{github.event.pull_request.head.ref}}

.github/workflows/docker_manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
runs-on: ubuntu-24.04
8484
steps:
8585
- name: Checkout code
86-
uses: actions/checkout@v5
86+
uses: actions/checkout@v6
8787
with:
8888
submodules: recursive
8989
ref: ${{github.event.pull_request.head.ref}}

.github/workflows/hook_copr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-24.04
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
with:
2424
submodules: recursive
2525
ref: ${{ github.ref }}

.github/workflows/main_matrix.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- check
3636
runs-on: ubuntu-24.04
3737
steps:
38-
- uses: actions/checkout@v5
38+
- uses: actions/checkout@v6
3939
- uses: actions/setup-python@v6
4040
with:
4141
python-version: 3.x
@@ -59,7 +59,7 @@ jobs:
5959
version:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@v5
62+
- uses: actions/checkout@v6
6363
- name: Get release version string
6464
run: |
6565
echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
@@ -81,7 +81,7 @@ jobs:
8181
runs-on: ubuntu-latest
8282
if: ${{ github.event_name != 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
8383
steps:
84-
- uses: actions/checkout@v5
84+
- uses: actions/checkout@v6
8585
- name: Build base
8686
id: base
8787
uses: ./.github/actions/setup-base
@@ -163,7 +163,7 @@ jobs:
163163
needs: [version, build]
164164
steps:
165165
- name: Checkout code
166-
uses: actions/checkout@v5
166+
uses: actions/checkout@v6
167167
with:
168168
ref: ${{github.event.pull_request.head.ref}}
169169
repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -242,7 +242,7 @@ jobs:
242242
- package-pio-deps-native-tft
243243
steps:
244244
- name: Checkout
245-
uses: actions/checkout@v5
245+
uses: actions/checkout@v6
246246

247247
- name: Setup Python
248248
uses: actions/setup-python@v6
@@ -311,7 +311,7 @@ jobs:
311311
needs: [release-artifacts, version]
312312
steps:
313313
- name: Checkout
314-
uses: actions/checkout@v5
314+
uses: actions/checkout@v6
315315

316316
- name: Setup Python
317317
uses: actions/setup-python@v6
@@ -366,7 +366,7 @@ jobs:
366366
esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,rp2350,stm32
367367
steps:
368368
- name: Checkout
369-
uses: actions/checkout@v5
369+
uses: actions/checkout@v6
370370

371371
- name: Setup Python
372372
uses: actions/setup-python@v6

0 commit comments

Comments
 (0)