DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce to ubuntu-os, fixed release build name using the correct halconfig

Browse Source
This commit is contained in:
Tim Huyeng 2022-11-01 11:33:27 +01:00
parent 06286fafa7
commit fe156d006d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build.yml vendored
View File

@ -13,7 +13,8 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-latest, windows-latest, macos-latest] os: [ubuntu-latest]
# os: [ubuntu-latest, windows-latest, macos-latest]
include: include:
- os: ubuntu-latest - os: ubuntu-latest
path: ~/.cache/pip path: ~/.cache/pip
@ -57,7 +58,7 @@ jobs:
cp src/paxcounter_orig.conf src/paxcounter.conf cp src/paxcounter_orig.conf src/paxcounter.conf
- name: Clean - name: Clean
run: pio run -t clean -e ci run: pio run -t clean -e ci
- name: Run PlatformIO Test - name: Run PlatformIO CI for ${{ matrix.board }}
env: env:
CI_HALFILE: ${{ matrix.board }} CI_HALFILE: ${{ matrix.board }}
run: pio run -e ci run: pio run -e ci

11
build.py
View File

@ -28,13 +28,14 @@ haldir = os.path.join (srcdir, "hal")
# check if hal file is present in source directory # check if hal file is present in source directory
halconfig = config.get("board", "halfile") halconfig = config.get("board", "halfile")
# check if hal file is not set by ENV CI_HALFILE # check if hal file is set by ENV CI_HALFILE
if not os.getenv("CI_HALFILE"): if os.getenv("CI_HALFILE"):
halconfigfile = os.path.join (haldir, halconfig)
else:
# if set, use ENV CI_HALFILE # if set, use ENV CI_HALFILE
print("CI_HALFILE ENV FOUND") print("CI_HALFILE ENV FOUND")
halconfigfile = os.path.join (haldir,os.getenv("CI_HALFILE")) # 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): if os.path.isfile(halconfigfile) and os.access(halconfigfile, os.R_OK):
print("Parsing hardware configuration from " + halconfigfile) print("Parsing hardware configuration from " + halconfigfile)