reduce to ubuntu-os, fixed release build name using the correct halconfig
This commit is contained in:
parent
06286fafa7
commit
fe156d006d
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
@ -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
11
build.py
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user