Skip to content

Commit 6fb60ef

Browse files
authored
CI: Update some deprecated dependency versions (#669)
* 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.
1 parent 65c941a commit 6fb60ef

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616

1717
jobs:
1818
micropython:
19+
continue-on-error: true
1920
strategy:
2021
matrix:
2122
os:
@@ -28,10 +29,10 @@ jobs:
2829
env:
2930
GITHUB_CONTEXT: ${{ toJson(github) }}
3031
run: echo "$GITHUB_CONTEXT"
31-
- name: Set up Python 3.10
32-
uses: actions/setup-python@v1
32+
- name: Set up Python 3.12
33+
uses: actions/setup-python@v5
3334
with:
34-
python-version: "3.10"
35+
python-version: "3.12"
3536

3637
- name: Install requirements
3738
run: |
@@ -44,10 +45,10 @@ jobs:
4445
gcc --version
4546
python3 --version
4647
- name: Checkout ulab
47-
uses: actions/checkout@v1
48+
uses: actions/checkout@v4
4849

4950
- name: Checkout micropython repo
50-
uses: actions/checkout@v2
51+
uses: actions/checkout@v4
5152
with:
5253
repository: micropython/micropython
5354
path: micropython
@@ -56,6 +57,7 @@ jobs:
5657
run: ./build.sh ${{ matrix.dims }}
5758

5859
circuitpython:
60+
continue-on-error: true
5961
strategy:
6062
matrix:
6163
os:
@@ -68,18 +70,18 @@ jobs:
6870
env:
6971
GITHUB_CONTEXT: ${{ toJson(github) }}
7072
run: echo "$GITHUB_CONTEXT"
71-
- name: Set up Python 3.10
72-
uses: actions/setup-python@v1
73+
- name: Set up Python 3.12
74+
uses: actions/setup-python@v5
7375
with:
74-
python-version: "3.10"
76+
python-version: "3.12"
7577

7678
- name: Versions
7779
run: |
7880
gcc --version
7981
python3 --version
8082
8183
- name: Checkout ulab
82-
uses: actions/checkout@v1
84+
uses: actions/checkout@v4
8385

8486
- name: Install requirements
8587
run: |

build-cp.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ HERE="$(dirname -- "$(readlinkf_posix -- "${0}")" )"
4141
rm -rf circuitpython/extmod/ulab; ln -s "$HERE" circuitpython/extmod/ulab
4242
dims=${1-2}
4343
make -C circuitpython/mpy-cross -j$NPROC
44-
sed -e '/MICROPY_PY_UHASHLIB/s/1/0/' < circuitpython/ports/unix/mpconfigport.h > circuitpython/ports/unix/mpconfigport_ulab.h
45-
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
44+
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
4645

4746
# bash test-common.sh "${dims}" "circuitpython/ports/unix/micropython-$dims"
4847

0 commit comments

Comments
 (0)