Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 14:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: rename dual envs and fix tag-triggered builds for OLED and e-ink

Browse Source 
Rename WioTrackerL1_companion_radio_dual_settings → WioTrackerL1_companion_dual
and WioTrackerL1Eink_companion_radio_dual → WioTrackerL1Eink_companion_dual.

Fix CI workflow: remove hardcoded branch refs so both build jobs check out
the tagged commit; add version extraction to each build job (previously
GIT_TAG_VERSION was only set in the release job, leaving FIRMWARE_VERSION
empty during builds); update build commands to use new env names.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-24 00:13:34 +02:00
parent 631bd543bf
commit 137b0234d5
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build-wio-tracker-l1-firmwares.yml vendored
View File

@@ -20,8 +20,9 @@ jobs:
- name: Clone Repo - name: Clone Repo
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
ref: wio-tracker-l1-improvements - name: Extract Version from Git Tag
run: echo "GIT_TAG_VERSION=v${GITHUB_REF_NAME#*-v}" >> $GITHUB_ENV
- name: Setup Build Environment - name: Setup Build Environment
uses: ./.github/actions/setup-build-environment uses: ./.github/actions/setup-build-environment
@@ -29,7 +30,7 @@ jobs:
- name: Build Dual OLED Firmware - name: Build Dual OLED Firmware
env: env:
FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }} FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
run: /usr/bin/env bash build.sh build-wio-tracker-l1-firmwares run: /usr/bin/env bash build.sh build-firmware WioTrackerL1_companion_dual
- name: Upload OLED Firmware - name: Upload OLED Firmware
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@@ -43,8 +44,9 @@ jobs:
- name: Clone Repo - name: Clone Repo
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
ref: eink-ui - name: Extract Version from Git Tag
run: echo "GIT_TAG_VERSION=v${GITHUB_REF_NAME#*-v}" >> $GITHUB_ENV
- name: Setup Build Environment - name: Setup Build Environment
uses: ./.github/actions/setup-build-environment uses: ./.github/actions/setup-build-environment
@@ -52,7 +54,7 @@ jobs:
- name: Build Dual E-ink Firmware - name: Build Dual E-ink Firmware
env: env:
FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }} FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
run: /usr/bin/env bash build.sh build-firmware WioTrackerL1Eink_companion_radio_dual run: /usr/bin/env bash build.sh build-firmware WioTrackerL1Eink_companion_dual
- name: Upload E-ink Firmware - name: Upload E-ink Firmware
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

2
build.sh
View File

@@ -231,7 +231,7 @@ build_companion_firmwares() {
} }
build_wio_tracker_l1_firmwares() { build_wio_tracker_l1_firmwares() {
build_firmware "WioTrackerL1_companion_radio_dual_settings" build_firmware "WioTrackerL1_companion_dual"
} }
build_room_server_firmwares() { build_room_server_firmwares() {

2
variants/wio-tracker-l1-eink/platformio.ini
View File

@@ -60,7 +60,7 @@ extends = WioTrackerL1Eink
extra_scripts = post:create-uf2.py extra_scripts = post:create-uf2.py
; Dual BLE+USB ; Dual BLE+USB
[env:WioTrackerL1Eink_companion_radio_dual] [env:WioTrackerL1Eink_companion_dual]
extends = WioTrackerL1Eink extends = WioTrackerL1Eink
build_flags = ${WioTrackerL1Eink.build_flags} build_flags = ${WioTrackerL1Eink.build_flags}
-D DUAL_SERIAL=1 -D DUAL_SERIAL=1

2
variants/wio-tracker-l1/platformio.ini
View File

@@ -145,7 +145,7 @@ build_flags = ${WioTrackerL1CompanionBLE.build_flags}
[env:WioTrackerL1_companion_radio_dual] [env:WioTrackerL1_companion_radio_dual]
extends = WioTrackerL1CompanionDual extends = WioTrackerL1CompanionDual
[env:WioTrackerL1_companion_radio_dual_settings] [env:WioTrackerL1_companion_dual]
extends = WioTrackerL1CompanionDual extends = WioTrackerL1CompanionDual
build_flags = ${WioTrackerL1CompanionDual.build_flags} build_flags = ${WioTrackerL1CompanionDual.build_flags}
-D UI_HAS_JOYSTICK_UPDOWN=1 -D UI_HAS_JOYSTICK_UPDOWN=1