Skip to content

Commit a964654

Browse files
authored
Merge pull request #1 from prokrypt/merge-upstream-2026-10-25
Merge upstream develop (95ff510) into no-auto-writes
2 parents 328e7b0 + e9e588b commit a964654

214 files changed

Lines changed: 11141 additions & 1530 deletions

File tree

Some content is hidden

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

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1515
libssl-dev \
1616
libulfius-dev \
1717
libyaml-cpp-dev \
18+
libavahi-client-dev \
1819
libjsoncpp-dev \
1920
pipx \
2021
pkg-config \

‎.github/actionlint.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ self-hosted-runner:
44
labels:
55
- arctastic
66
- test-runner
7+
# GitHub-Hosted runners:
8+
- ubuntu-26.04
9+
- ubuntu-26.04-arm

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
- name: Setup Python
1919
uses: actions/setup-python@v7
2020
with:
21-
python-version: 3.x
21+
python-version: "3.14"
2222
cache: pip
2323
cache-dependency-path: |
2424
.github/actions/**

‎.github/actions/setup-native-test/action.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
- name: Setup Python
1111
uses: actions/setup-python@v7
1212
with:
13-
python-version: 3.x
13+
python-version: "3.14"
1414
cache: pip
1515
cache-dependency-path: |
1616
.github/actions/**
@@ -25,7 +25,8 @@ runs:
2525
sudo apt-get -y update --fix-missing
2626
sudo apt-get install -y ccache lcov \
2727
libbluetooth-dev libsdbus-c++-dev libgpiod-dev libyaml-cpp-dev libjsoncpp-dev openssl libssl-dev \
28-
libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev libcurl4-gnutls-dev
28+
libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev \
29+
libcurl4-gnutls-dev libavahi-client-dev
2930
3031
- name: Install PlatformIO
3132
shell: bash

‎.github/actions/setup-native/action.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ runs:
1010

1111
- name: Install libs needed for native build
1212
shell: bash
13-
run: |
14-
sudo apt-get install -y libbluetooth-dev libsdbus-c++-dev libgpiod-dev libyaml-cpp-dev libjsoncpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev libcurl4-gnutls-dev libnotify-dev
13+
run: >
14+
sudo apt-get install -y
15+
libbluetooth-dev libsdbus-c++-dev libgpiod-dev libyaml-cpp-dev libjsoncpp-dev openssl libssl-dev
16+
libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev
17+
libcurl4-gnutls-dev libnotify-dev libavahi-client-dev

‎.github/workflows/build_debian_src.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions:
2020

2121
jobs:
2222
build-debian-src:
23-
runs-on: ubuntu-24.04
23+
runs-on: ubuntu-26.04
2424
# Only pushes to the default branch (develop) populate the cache; PR / merge_group runs
2525
# restore it but never save, so they stop filling up the repo's Actions cache storage.
2626
env:
@@ -39,9 +39,9 @@ jobs:
3939
# Build-tools (notably platformio) come from the Meshtastic project
4040
# on the OpenSUSE Build Service:
4141
# https://build.opensuse.org/project/show/network:Meshtastic:build-tools
42-
echo 'deb http://download.opensuse.org/repositories/network:/Meshtastic:/build-tools/xUbuntu_24.04/ /' \
42+
echo 'deb http://download.opensuse.org/repositories/network:/Meshtastic:/build-tools/xUbuntu_26.04/ /' \
4343
| sudo tee /etc/apt/sources.list.d/network:Meshtastic:build-tools.list
44-
curl -fsSL https://download.opensuse.org/repositories/network:Meshtastic:build-tools/xUbuntu_24.04/Release.key \
44+
curl -fsSL https://download.opensuse.org/repositories/network:Meshtastic:build-tools/xUbuntu_26.04/Release.key \
4545
| gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/network_Meshtastic_build-tools.gpg >/dev/null
4646
sudo apt-get update -y --fix-missing
4747
sudo apt-get install -y build-essential devscripts equivs

‎.github/workflows/build_one_target.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
matrix:
3333
arch:
3434
- all
35-
runs-on: ubuntu-24.04
35+
runs-on: ubuntu-26.04
3636
steps:
3737
- uses: actions/checkout@v7
3838
- uses: actions/setup-python@v7
3939
with:
40-
python-version: 3.x
40+
python-version: "3.14"
4141
cache: pip
4242
- run: pip install -U platformio
4343
- name: Generate matrix
@@ -76,7 +76,7 @@ jobs:
7676

7777
version:
7878
if: ${{ inputs.target != '' }}
79-
runs-on: ubuntu-latest
79+
runs-on: ubuntu-26.04
8080
steps:
8181
- uses: actions/checkout@v7
8282
- name: Get release version string
@@ -103,7 +103,7 @@ jobs:
103103
permissions:
104104
contents: read
105105
pull-requests: write
106-
runs-on: ubuntu-latest
106+
runs-on: ubuntu-26.04
107107
needs: [version, build]
108108
steps:
109109
- name: Checkout code

‎.github/workflows/build_portduino_wasm.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions: {}
1717
jobs:
1818
build-wasm:
1919
name: Build PortDuino WASM
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-26.04
2121
# Only pushes to the default branch (develop) populate the cache; PR / merge_group runs
2222
# restore it but never save, so they stop filling up the repo's Actions cache storage.
2323
env:

‎.github/workflows/docker_manifest.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
distro: debian
2323
platform: linux/amd64
24-
runs-on: ubuntu-24.04
24+
runs-on: ubuntu-26.04
2525
push: true
2626
secrets: inherit
2727

@@ -30,7 +30,7 @@ jobs:
3030
with:
3131
distro: debian
3232
platform: linux/arm64
33-
runs-on: ubuntu-24.04-arm
33+
runs-on: ubuntu-26.04-arm
3434
push: true
3535
secrets: inherit
3636

@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
distro: debian
4141
platform: linux/arm/v7
42-
runs-on: ubuntu-24.04-arm
42+
runs-on: ubuntu-26.04-arm
4343
push: true
4444
secrets: inherit
4545

@@ -48,7 +48,7 @@ jobs:
4848
with:
4949
distro: debian
5050
platform: linux/riscv64
51-
runs-on: ubuntu-24.04-arm
51+
runs-on: ubuntu-26.04-arm
5252
push: true
5353
secrets: inherit
5454

@@ -57,7 +57,7 @@ jobs:
5757
with:
5858
distro: alpine
5959
platform: linux/amd64
60-
runs-on: ubuntu-24.04
60+
runs-on: ubuntu-26.04
6161
push: true
6262
secrets: inherit
6363

@@ -66,7 +66,7 @@ jobs:
6666
with:
6767
distro: alpine
6868
platform: linux/arm64
69-
runs-on: ubuntu-24.04-arm
69+
runs-on: ubuntu-26.04-arm
7070
push: true
7171
secrets: inherit
7272

@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
distro: alpine
7777
platform: linux/arm/v7
78-
runs-on: ubuntu-24.04-arm
78+
runs-on: ubuntu-26.04-arm
7979
push: true
8080
secrets: inherit
8181

@@ -84,7 +84,7 @@ jobs:
8484
with:
8585
distro: alpine
8686
platform: linux/riscv64
87-
runs-on: ubuntu-24.04-arm
87+
runs-on: ubuntu-26.04-arm
8888
push: true
8989
secrets: inherit
9090

@@ -100,7 +100,7 @@ jobs:
100100
- docker-alpine-arm64
101101
- docker-alpine-armv7
102102
- docker-alpine-riscv64
103-
runs-on: ubuntu-24.04
103+
runs-on: ubuntu-26.04
104104
steps:
105105
- name: Checkout code
106106
uses: actions/checkout@v7

‎.github/workflows/firmware-size-comment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
github.event.workflow_run.conclusion != 'cancelled' &&
1717
github.repository == 'meshtastic/firmware'
1818
continue-on-error: true
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-26.04
2020
steps:
2121
- name: Download size report
2222
id: download

0 commit comments

Comments
 (0)