jepler/micropython-ulab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CI: Update some deprecated dependency versions (#669)

Browse source 
* CI: Bump various build workflow versions.

* CI: Continue other jobs on failure.

Give a more complete overview of failures, rather than forcing the developer to play whack-a-mole.

* CI: Do not modify unix mpconfigport.h.

Since `MICROPY_PY_UHASHLIB` does not occur in unix/mpconfigport.h this would have simply
duplicated the config file and supplied it as `MP_CONFIGFILE` triggering a bug in how this
define is handled.
This commit is contained in:
Philip Howard 2024-06-06 20:54:24 +01:00 committed by GitHub
parent 65c941a805
commit 6fb60ef9cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/build.yml vendored
View file

@ -16,6 +16,7 @@ on:
jobs:
micropython:
continue-on-error: true
strategy:
matrix:
os:
@ -28,10 +29,10 @@ jobs:
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Set up Python 3.10
uses: actions/setup-python@v1
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: Install requirements
run: |
@ -44,10 +45,10 @@ jobs:
gcc --version
python3 --version
- name: Checkout ulab
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Checkout micropython repo
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: micropython/micropython
path: micropython
@ -56,6 +57,7 @@ jobs:
run: ./build.sh ${{ matrix.dims }}
circuitpython:
continue-on-error: true
strategy:
matrix:
os:
@ -68,10 +70,10 @@ jobs:
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Set up Python 3.10
uses: actions/setup-python@v1
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"
- name: Versions
run: |
@ -79,7 +81,7 @@ jobs:
python3 --version
- name: Checkout ulab
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Install requirements
run: |

3
build-cp.sh
View file

@ -41,8 +41,7 @@ HERE="$(dirname -- "$(readlinkf_posix -- "${0}")" )"
rm -rf circuitpython/extmod/ulab; ln -s "$HERE" circuitpython/extmod/ulab
dims=${1-2}
make -C circuitpython/mpy-cross -j$NPROC
sed -e '/MICROPY_PY_UHASHLIB/s/1/0/' < circuitpython/ports/unix/mpconfigport.h > circuitpython/ports/unix/mpconfigport_ulab.h
make -k -C circuitpython/ports/unix -j$NPROC DEBUG=1 MICROPY_PY_FFI=0 MICROPY_PY_BTREE=0 MICROPY_SSL_AXTLS=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMP_CONFIGFILE=\"<mpconfigport_ulab.h>\" -Wno-tautological-constant-out-of-range-compare -Wno-unknown-pragmas -DULAB_MAX_DIMS=$dims" BUILD=build-$dims PROG=micropython-$dims
make -k -C circuitpython/ports/unix -j$NPROC DEBUG=1 MICROPY_PY_FFI=0 MICROPY_PY_BTREE=0 MICROPY_SSL_AXTLS=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-Wno-tautological-constant-out-of-range-compare -Wno-unknown-pragmas -DULAB_MAX_DIMS=$dims" BUILD=build-$dims PROG=micropython-$dims
# bash test-common.sh "${dims}" "circuitpython/ports/unix/micropython-$dims"