Skip to content

Commit a7a9ab6

Browse files
authored
Merge branch 'develop' into fix-telemetry-scaling
2 parents 44fbf59 + 486fa74 commit a7a9ab6

Some content is hidden

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

46 files changed

+533
-260
lines changed

.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: 0 additions & 176 deletions
This file was deleted.

.github/workflows/build_one_target.yml

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
- rp2040
1616
- rp2350
1717
- stm32
18-
- native
1918
target:
2019
type: string
2120
required: false
@@ -42,10 +41,9 @@ jobs:
4241
- rp2040
4342
- rp2350
4443
- stm32
45-
4644
runs-on: ubuntu-24.04
4745
steps:
48-
- uses: actions/checkout@v5
46+
- uses: actions/checkout@v6
4947
- uses: actions/setup-python@v6
5048
with:
5149
python-version: 3.x
@@ -60,13 +58,13 @@ jobs:
6058
echo "Arch: ${{matrix.arch}}" >> $GITHUB_STEP_SUMMARY
6159
echo "Ref: $GITHUB_REF" >> $GITHUB_STEP_SUMMARY
6260
echo "Targets:" >> $GITHUB_STEP_SUMMARY
63-
echo $TARGETS >> $GITHUB_STEP_SUMMARY
61+
echo $TARGETS | jq -r 'sort_by(.board) |.[] | "- " + .board' >> $GITHUB_STEP_SUMMARY
6462
6563
version:
6664
if: ${{ inputs.target != '' }}
6765
runs-on: ubuntu-latest
6866
steps:
69-
- uses: actions/checkout@v5
67+
- uses: actions/checkout@v6
7068
- name: Get release version string
7169
run: |
7270
echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
@@ -87,25 +85,6 @@ jobs:
8785
pio_env: ${{ inputs.target }}
8886
platform: ${{ inputs.arch }}
8987

90-
build-debian-src:
91-
if: ${{ github.repository == 'meshtastic/firmware' && inputs.arch == 'native' }}
92-
uses: ./.github/workflows/build_debian_src.yml
93-
with:
94-
series: UNRELEASED
95-
build_location: local
96-
secrets: inherit
97-
98-
package-pio-deps-native-tft:
99-
if: ${{ inputs.arch == 'native' }}
100-
uses: ./.github/workflows/package_pio_deps.yml
101-
with:
102-
pio_env: native-tft
103-
secrets: inherit
104-
105-
test-native:
106-
if: ${{ !contains(github.ref_name, 'event/') && github.event_name != 'workflow_dispatch' || !contains(github.ref_name, 'event/') && inputs.arch == 'native' && inputs.target != '' }}
107-
uses: ./.github/workflows/test_native.yml
108-
10988
gather-artifacts:
11089
permissions:
11190
contents: write
@@ -114,7 +93,7 @@ jobs:
11493
needs: [version, build]
11594
steps:
11695
- name: Checkout code
117-
uses: actions/checkout@v5
96+
uses: actions/checkout@v6
11897
with:
11998
ref: ${{github.event.pull_request.head.ref}}
12099
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)