Merge pull request #906 from t-huyeng/build-workflow

Build workflow - run for all boards
This commit is contained in:
Verkehrsrot 2022-11-01 21:24:24 +01:00 committed by GitHub
commit b6320f0cc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 79 additions and 23 deletions

View File

@ -4,24 +4,60 @@ on:
pull_request:
push:
branches:
- master
- master
- build-workflow
workflow_dispatch:
jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest]
# os: [ubuntu-latest, windows-latest, macos-latest]
include:
- os: ubuntu-latest
path: ~/.cache/pip
platformio-path: ~/.platformio
- os: macos-latest
path: ~/Library/Caches/pip
platformio-path: ~/Library/Caches/platformio
- os: windows-latest
path: ~\AppData\Local\pip\Cache
platformio-path: ~\AppData\Local\platformio\Cache
- os: ubuntu-latest
path: ~/.cache/pip
platformio-path: ~/.platformio
# - os: macos-latest
# path: ~/Library/Caches/pip
# platformio-path: ~/Library/Caches/platformio
# - os: windows-latest
# path: ~\AppData\Local\pip\Cache
# platformio-path: ~\AppData\Local\platformio\Cache
board:
[
generic.h,
ebox.h,
eboxtube.h,
ecopower.h,
heltec.h,
heltecv2.h,
heltecv21.h,
ttgov1.h,
ttgov2.h,
ttgov21old.h,
ttgov21new.h,
ttgofox.h,
ttgobeam.h,
ttgobeam10.h,
ttgotdisplay.h,
ttgotwristband.h,
fipy.h,
lopy.h,
lopy4.h,
lolin32litelora.h,
lolin32lora.h,
lolin32lite.h,
wemos32oled.h,
wemos32matrix.h,
octopus32.h,
tinypico.h,
tinypicomatrix.h,
m5core.h,
m5fire.h,
olimexpoeiso.h,
]
runs-on: ${{ matrix.os }}
steps:
@ -52,5 +88,9 @@ jobs:
cp src/loraconf_sample.h src/loraconf.h
cp src/ota_sample.conf src/ota.conf
cp src/paxcounter_orig.conf src/paxcounter.conf
- name: Run PlatformIO
run: pio run
- name: Clean
run: pio run -t clean -e ci
- name: Run PlatformIO CI for ${{ matrix.board }}
env:
CI_HALFILE: ${{ matrix.board }}
run: pio run -e ci

View File

@ -27,7 +27,16 @@ haldir = os.path.join (srcdir, "hal")
# check if hal file is present in source directory
halconfig = config.get("board", "halfile")
# check if hal file is set by ENV CI_HALFILE
if os.getenv("CI_HALFILE"):
# if set, use ENV CI_HALFILE
print("CI_HALFILE ENV FOUND")
# override halconfig
halconfig = os.getenv("CI_HALFILE")
halconfigfile = os.path.join (haldir, halconfig)
if os.path.isfile(halconfigfile) and os.access(halconfigfile, os.R_OK):
print("Parsing hardware configuration from " + halconfigfile)
else:
@ -98,10 +107,10 @@ env.Replace(PAXEXPRESS_API_TOKEN=apitoken)
# get runtime credentials and put them to compiler directive
env.Append(BUILD_FLAGS=[
u'-DWIFI_SSID=\\"' + mykeys["OTA_WIFI_SSID"] + '\\"',
u'-DWIFI_PASS=\\"' + mykeys["OTA_WIFI_PASS"] + '\\"',
u'-DPAXEXPRESS_USER=\\"' + mykeys["PAXEXPRESS_USER"] + '\\"',
u'-DPAXEXPRESS_REPO=\\"' + mykeys["PAXEXPRESS_REPO"] + '\\"',
u'-DWIFI_SSID=\\"' + mykeys["OTA_WIFI_SSID"] + '\\"',
u'-DWIFI_PASS=\\"' + mykeys["OTA_WIFI_PASS"] + '\\"',
u'-DPAXEXPRESS_USER=\\"' + mykeys["PAXEXPRESS_USER"] + '\\"',
u'-DPAXEXPRESS_REPO=\\"' + mykeys["PAXEXPRESS_REPO"] + '\\"',
u'-DPAXEXPRESS_PACKAGE=\\"' + package + '\\"',
u'-DARDUINO_LMIC_PROJECT_CONFIG_H=' + lmicconfig,
u'-I \"' + srcdir + '\"'
@ -127,7 +136,7 @@ def publish_paxexpress(source, target, env):
}
r = None
try:
r = requests.put(url,
data=open(firmware_path, "rb"),

View File

@ -82,7 +82,7 @@ lib_deps_basic =
https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
bblanchon/ArduinoJson @ ^6
makuna/RTC @ ^2.3.5
spacehuhn/SimpleButton
spacehuhn/SimpleButton
lewisxhe/XPowersLib @ ^0.1.4
256dpi/MQTT @ ^2.5.0
lib_deps_all =
@ -94,7 +94,6 @@ lib_deps_all =
${common.lib_deps_sensors}
${common.lib_deps_ledmatrix}
build_flags_basic =
-include "src/hal/${board.halfile}"
-include "src/paxcounter.conf"
'-DCORE_DEBUG_LEVEL=${common.debug_level}'
'-DLOG_LOCAL_LEVEL=${common.debug_level}'
@ -115,7 +114,9 @@ upload_speed = ${common.upload_speed}
;upload_port = COM12
platform = ${common.platform_espressif32}
lib_deps = ${common.lib_deps_all}
build_flags = ${common.build_flags_all}
build_flags =
-include "src/hal/${board.halfile}"
${common.build_flags_all}
upload_protocol = ${common.upload_protocol}
extra_scripts = ${common.extra_scripts}
monitor_speed = ${common.monitor_speed}
@ -131,3 +132,9 @@ upload_protocol = esptool
upload_protocol = esptool
platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git
[env:ci]
build_flags =
-include "src/hal/${sysenv.CI_HALFILE}" ; set by CI
${common.build_flags_all}
upload_protocol = esptool

View File

@ -97,7 +97,7 @@
#define RCMDPORT 2 // remote commands
#define STATUSPORT 2 // remote command results
#define CONFIGPORT 3 // config query results
#define GPSPORT 4 // gps - NOTE: set to 1 to send combined GPS+COUNTERPORT payload
#define GPSPORT 4 // gps - NOTE: set to 1 to send combined GPS+COUNTERPORT payload
#define BUTTONPORT 5 // button pressed signal
#define RESERVEDPORT 6 // reserved (unused)
#define BMEPORT 7 // BME680 sensor
@ -126,4 +126,4 @@
#define MQTT_PASSWD "public"
#define MQTT_RETRYSEC 20 // retry reconnect every 20 seconds
#define MQTT_KEEPALIVE 10 // keep alive interval in seconds
//#define MQTT_CLIENTNAME "my_paxcounter" // generated by default
//#define MQTT_CLIENTNAME "my_paxcounter" // generated by default