Skip to content

Commit 98a05e4

Browse files
authored
attempt to fix python ci (#2283)
* attempt to fix python ci * more debugging hints * fix mingw * upgrade from macos-13 to macos-14 * use cygpath to sanitize * fix python2.7 * use macos-15-intel for android * left out
1 parent eb97134 commit 98a05e4

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/build-uc2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ jobs:
248248
matrix:
249249
config:
250250
- {
251-
os: macos-13, # x64
251+
os: macos-14, # x64
252252
arch: x64,
253253
name: 'macos-x64 cmake shared',
254254
shared: 'yes',
@@ -257,7 +257,7 @@ jobs:
257257
generators: 'Ninja'
258258
}
259259
- {
260-
os: macos-13,
260+
os: macos-14,
261261
arch: x64,
262262
name: 'macos-x64 cmake static',
263263
shared: 'no',
@@ -284,7 +284,7 @@ jobs:
284284
generators: 'Ninja'
285285
}
286286
- {
287-
os: macos-13,
287+
os: macos-15-intel,
288288
arch: x86_64,
289289
name: 'android cmake',
290290
artifact: 'Android-x86_64.7z',

.github/workflows/build-wheels-publish.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- { os: ubuntu-24.04-arm, arch: aarch64, cibw_build: 'cp*-manylinux*', cibw_skip: 'cp36*' }
5555
# aarch64 - musllinux
5656
- { os: ubuntu-24.04-arm, arch: aarch64, cibw_build: 'cp*-musllinux*', cibw_skip: 'cp36*' }
57-
- { os: macos-13, arch: x86_64, cibw_build: 'cp*', cibw_skip: 'cp36*' }
57+
- { os: macos-14, arch: x86_64, cibw_build: 'cp*', cibw_skip: 'cp36*' }
5858
- { os: macos-14, arch: arm64, cibw_build: 'cp*', cibw_skip: 'cp36* cp37*' }
5959
- { os: windows-2022, arch: AMD64, cibw_build: 'cp*', cibw_skip: 'cp36*' }
6060
- { os: windows-2022, arch: x86, cibw_build: 'cp*', cibw_skip: 'cp36*' }
@@ -134,7 +134,7 @@ jobs:
134134
python3 -m pip install -U pip wheel
135135
python3 -m wheel tags --python-tag='py2' --abi-tag=none wheelhouse/*cp37*.whl
136136
137-
- uses: LizardByte/actions/actions/setup_python@v2025.715.25226
137+
- uses: LizardByte/actions/actions/setup_python@master
138138
if: (runner.os == 'Linux' && (matrix.arch == 'x86_64' || matrix.arch == 'aarch64') && matrix.cibw_build == 'cp*-manylinux*') || (runner.os == 'macOS' && matrix.arch == 'arm64') || (runner.os == 'Windows' && matrix.arch == 'AMD64')
139139
with:
140140
python-version: 2.7
@@ -144,8 +144,9 @@ jobs:
144144
if: runner.os == 'Windows' && matrix.arch == 'AMD64'
145145
shell: bash
146146
run: |
147-
C:/Python27/python.exe -m pip install capstone==4.0.2 wheelhouse/*py2*.whl
148-
C:/Python27/python.exe -m unittest discover tests/regress "*.py"
147+
pyenv local 2.7
148+
python.exe -m pip install capstone==4.0.2 wheelhouse/*py2*.whl
149+
python.exe -m unittest discover tests/regress "*.py"
149150
150151
# NOTE: no python2.7 support for macos-13: https://github.com/LizardByte/setup-python-action/issues/2
151152
- name: 'Python 2.7 tests - Non-Windows'

qemu/configure

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,14 @@ ld_has() {
198198
# make source path absolute
199199
source_path=$(cd "$(dirname -- "$0")"; pwd)
200200

201+
# Avoid having D:\ in $PWD under MinGW.
202+
PWD=$(pwd)
203+
if command -v cygpath >/dev/null 2>&1; then
204+
PWD=$(cygpath -u "$PWD")
205+
fi
201206
if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]";
202207
then
203-
error_exit "main directory cannot contain spaces nor colons"
208+
error_exit "main directory $source_path or $PWD cannot contain spaces nor colons"
204209
fi
205210

206211
# default parameters

0 commit comments

Comments
 (0)