Skip to content

Commit c4d4933

Browse files
authored
Merge branch 'develop' into vl53l0
2 parents 44895c2 + d6cf67b commit c4d4933

File tree

126 files changed

+2419
-470
lines changed

Some content is hidden

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

126 files changed

+2419
-470
lines changed

.github/workflows/docker_build.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,32 @@ jobs:
5656
echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
5757
id: version
5858

59-
- name: Docker login
60-
if: ${{ inputs.push }}
61-
uses: docker/login-action@v4
62-
with:
63-
username: meshtastic
64-
password: ${{ secrets.DOCKER_FIRMWARE_TOKEN }}
65-
6659
- name: Set up QEMU
6760
uses: docker/setup-qemu-action@v4
61+
with:
62+
cache-image: true
6863

6964
- name: Docker setup
7065
uses: docker/setup-buildx-action@v4
66+
with:
67+
# Add Google/Amazon DockerHub mirrors to buildkit config
68+
# https://docs.docker.com/build/ci/github-actions/configure-builder/#registry-mirror
69+
buildkitd-config-inline: |
70+
[registry."docker.io"]
71+
mirrors = ["mirror.gcr.io", "public.ecr.aws"]
7172
7273
- name: Sanitize platform string
7374
id: sanitize_platform
7475
# Replace slashes with underscores
7576
run: echo "cleaned_platform=${{ inputs.platform }}" | sed 's/\//_/g' >> $GITHUB_OUTPUT
7677

78+
- name: Docker login
79+
if: ${{ inputs.push }}
80+
uses: docker/login-action@v4
81+
with:
82+
username: meshtastic
83+
password: ${{ secrets.DOCKER_FIRMWARE_TOKEN }}
84+
7785
- name: Docker tag
7886
id: meta
7987
uses: docker/metadata-action@v6
@@ -95,3 +103,6 @@ jobs:
95103
platforms: ${{ inputs.platform }}
96104
build-args: |
97105
PIO_ENV=${{ inputs.pio_env }}
106+
# Cache image layers in GitHub Actions cache to speed up subsequent builds.
107+
cache-from: type=gha
108+
cache-to: type=gha,mode=max

.github/workflows/main_matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ jobs:
309309
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
310310

311311
- name: Create release
312-
uses: softprops/action-gh-release@v2
312+
uses: softprops/action-gh-release@v3
313313
id: create_release
314314
with:
315315
draft: true

.github/workflows/models_issue_triage.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Apply quality label if needed
4040
if: steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
41-
uses: actions/github-script@v8
41+
uses: actions/github-script@v9
4242
env:
4343
QUALITY_LABEL: ${{ steps.quality.outputs.response }}
4444
with:
@@ -80,7 +80,7 @@ jobs:
8080
# ─────────────────────────────────────────────────────────────────────────
8181
- name: Determine if completeness check should be skipped
8282
if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
83-
uses: actions/github-script@v8
83+
uses: actions/github-script@v9
8484
id: check-skip
8585
with:
8686
script: |
@@ -134,7 +134,7 @@ jobs:
134134

135135
- name: Process analysis result
136136
if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true' && steps.analysis.outputs.response != ''
137-
uses: actions/github-script@v8
137+
uses: actions/github-script@v9
138138
id: process
139139
env:
140140
AI_RESPONSE: ${{ steps.analysis.outputs.response }}
@@ -174,7 +174,7 @@ jobs:
174174
175175
- name: Apply triage label
176176
if: steps.process.outputs.label != '' && steps.process.outputs.label != 'none'
177-
uses: actions/github-script@v8
177+
uses: actions/github-script@v9
178178
env:
179179
LABEL_NAME: ${{ steps.process.outputs.label }}
180180
with:
@@ -200,7 +200,7 @@ jobs:
200200
201201
- name: Comment on issue
202202
if: steps.process.outputs.should_comment == 'true'
203-
uses: actions/github-script@v8
203+
uses: actions/github-script@v9
204204
env:
205205
COMMENT_BODY: ${{ steps.process.outputs.comment_body }}
206206
with:

.github/workflows/models_pr_triage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# Step 1: Check if PR already has automation/type labels (skip if so)
2323
# ─────────────────────────────────────────────────────────────────────────
2424
- name: Check existing labels
25-
uses: actions/github-script@v8
25+
uses: actions/github-script@v9
2626
id: check-labels
2727
with:
2828
script: |
@@ -58,7 +58,7 @@ jobs:
5858

5959
- name: Apply quality label if needed
6060
if: steps.check-labels.outputs.skip_all != 'true' && steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
61-
uses: actions/github-script@v8
61+
uses: actions/github-script@v9
6262
id: quality-label
6363
env:
6464
QUALITY_LABEL: ${{ steps.quality.outputs.response }}
@@ -113,7 +113,7 @@ jobs:
113113

114114
- name: Apply type label
115115
if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.classify.outputs.response != ''
116-
uses: actions/github-script@v8
116+
uses: actions/github-script@v9
117117
env:
118118
TYPE_LABEL: ${{ steps.classify.outputs.response }}
119119
with:

.github/workflows/package_ppa.yml

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
secrets:
66
PPA_GPG_PRIVATE_KEY:
77
required: true
8+
PPA_SFTP_PRIVATE_KEY:
9+
required: true
810
inputs:
911
ppa_repo:
1012
description: Meshtastic PPA to target
@@ -27,6 +29,7 @@ jobs:
2729
build_location: ppa
2830

2931
package-ppa:
32+
if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
3033
runs-on: ubuntu-24.04
3134
needs: build-debian-src
3235
steps:
@@ -40,7 +43,7 @@ jobs:
4043
shell: bash
4144
run: |
4245
sudo apt-get update -y --fix-missing
43-
sudo apt-get install -y dput
46+
sudo apt-get install -y dput openssh-client
4447
4548
- name: Import GPG key
4649
uses: crazy-max/ghaction-import-gpg@v7
@@ -65,8 +68,42 @@ jobs:
6568
- name: Display structure of downloaded files
6669
run: ls -lah
6770

68-
- name: Publish with dput
69-
if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
70-
timeout-minutes: 15 # dput is terrible, sometimes runs 'forever'
71+
- name: Trust Launchpad's SSH key
7172
run: |
72-
dput ${{ inputs.ppa_repo }} meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes
73+
mkdir -p ~/.ssh
74+
ssh-keyscan -H ppa.launchpad.net >> ~/.ssh/known_hosts
75+
76+
- name: Setup dput config
77+
env:
78+
ppa_login: meshtasticorg
79+
run: |
80+
sudo tee /etc/meshtastic-dput.cf >/dev/null <<EOF
81+
[ppa]
82+
fqdn = ppa.launchpad.net
83+
method = ftp
84+
incoming = ~%(ppa)s
85+
login = anonymous
86+
87+
[ssh-ppa]
88+
fqdn = ppa.launchpad.net
89+
method = sftp
90+
incoming = ~%(ssh-ppa)s
91+
login = ${ppa_login}
92+
EOF
93+
94+
- name: Import SSH key
95+
uses: webfactory/ssh-agent@v0.10.0
96+
with:
97+
ssh-private-key: ${{ secrets.PPA_SFTP_PRIVATE_KEY }}
98+
id: ssh
99+
100+
- name: Publish with dput (sftp)
101+
timeout-minutes: 30 # dput is terrible, sometimes runs 'forever'
102+
env:
103+
up_ppa_repo: ${{ inputs.ppa_repo }}
104+
up_series: ${{ inputs.series }}
105+
up_version: ${{ steps.version.outputs.deb }}
106+
run: >
107+
dput -c /etc/meshtastic-dput.cf
108+
ssh-${up_ppa_repo}
109+
meshtasticd_${up_version}~${up_series}_source.changes

.github/workflows/pr_enforce_labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check for PR labels
16-
uses: actions/github-script@v8
16+
uses: actions/github-script@v9
1717
with:
1818
script: |
1919
const labels = context.payload.pull_request.labels.map(label => label.name);

.github/workflows/pr_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
178178
- name: Comment test results on PR
179179
if: github.event_name == 'pull_request' && needs.native-tests.result != 'skipped'
180-
uses: actions/github-script@v8
180+
uses: actions/github-script@v9
181181
with:
182182
script: |
183183
const fs = require('fs');

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
node-version: 24
5353

5454
- name: Setup pnpm
55-
uses: pnpm/action-setup@v5
55+
uses: pnpm/action-setup@v6
5656
with:
5757
version: latest
5858

.trunk/trunk.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ plugins:
88
uri: https://github.com/trunk-io/plugins
99
lint:
1010
enabled:
11-
- checkov@3.2.513
12-
- renovate@43.100.0
11+
- checkov@3.2.517
12+
- renovate@43.110.9
1313
- prettier@3.8.1
14-
- trufflehog@3.94.1
14+
- trufflehog@3.94.3
1515
- yamllint@1.38.0
1616
- bandit@1.9.4
1717
- trivy@0.69.3
1818
- taplo@0.10.0
19-
- ruff@0.15.8
19+
- ruff@0.15.9
2020
- isort@8.0.1
2121
- markdownlint@0.48.0
2222
- oxipng@10.1.0
2323
- svgo@4.0.1
24-
- actionlint@1.7.11
24+
- actionlint@1.7.12
2525
- flake8@7.3.0
2626
- hadolint@2.14.0
2727
- shfmt@3.6.0
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
Lora:
3+
## Ebyte E80-900M22S
4+
## This is a bit experimental
5+
##
6+
##
7+
Module: lr1121
8+
gpiochip: 1 # subtract 32 from the gpio numbers
9+
DIO3_TCXO_VOLTAGE: 1.8
10+
CS: 16 #pin6 / GPIO48 1C0
11+
IRQ: 23 #pin17 / GPIO55 1C7
12+
Busy: 22 #pin16 / GPIO54 1C6
13+
Reset: 25 #pin13 / GPIO57 1D1
14+
15+
16+
spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
17+
spiSpeed: 2000000
18+
19+
rfswitch_table:
20+
pins: [DIO5, DIO6, DIO7]
21+
MODE_STBY: [LOW, LOW, LOW]
22+
MODE_RX: [LOW, HIGH, LOW]
23+
MODE_TX: [HIGH, HIGH, LOW]
24+
MODE_TX_HP: [HIGH, LOW, LOW]
25+
MODE_TX_HF: [LOW, LOW, LOW]
26+
MODE_GNSS: [LOW, LOW, HIGH]
27+
MODE_WIFI: [LOW, LOW, LOW]
28+
29+
General:
30+
MACAddressSource: eth0

0 commit comments

Comments
 (0)