summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngus Gratton <angus@redyak.com.au>2024-11-20 16:28:33 +1100
committerDamien George <damien@micropython.org>2024-11-28 23:12:06 +1100
commit8ec067272a2b03c182f4723026e1d94dd6a44835 (patch)
tree525bf9473f8b1bb2d8f7e3af770cec1fb2e5eb31
parent8e11e5f1a14ca3395afaab2e42edebe41221eba1 (diff)
github/workflows: Workaround using CPython 3.12 in MSYS2 builds.
Once MSYS2 repository updates past Python 3.12, this commit can be reverted. Explanation: CPython 3.12 can't pass sys_settrace_features test (see parent commit for explanation). MSYS2 mingw-w64-ARCH-python package is currently 3.12.7. MSYS2 doesn't recommend installing old packages from their archive (due to library dependencies), so switch to the GitHub CI setup-python action for now. This work was funded through GitHub Sponsors. Signed-off-by: Angus Gratton <angus@redyak.com.au>
-rw-r--r--.github/workflows/ports_windows.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 91a3192a1..84e018ba1 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -110,6 +110,11 @@ jobs:
run:
shell: msys2 {0}
steps:
+ - uses: actions/setup-python@v5
+ # note: can go back to installing mingw-w64-${{ matrix.env }}-python after
+ # MSYS2 updates to Python >3.12 (due to settrace compatibility issue)
+ with:
+ python-version: '3.11'
- uses: msys2/setup-msys2@v2
with:
msystem: ${{ matrix.sys }}
@@ -118,9 +123,9 @@ jobs:
make
mingw-w64-${{ matrix.env }}-gcc
pkg-config
- mingw-w64-${{ matrix.env }}-python3
git
diffutils
+ path-type: inherit # Remove when setup-python is removed
- uses: actions/checkout@v4
- name: Build mpy-cross.exe
run: make -C mpy-cross -j2