Skip to content

Commit cc352d5

Browse files
committed
Fix CI toolchain drift failures
The PR was failing before it reached the PyYAML regression tests in two places: the cp38 wheel jobs installed latest cibuildwheel, whose 4.x series no longer supports Python 3.8, and the Windows arm64 libyaml build used a newer CMake that rejects libyaml 0.2.5's old minimum policy version. Pin the cp38 wheel jobs to cibuildwheel<4, and quote the matrix-provided pip package spec so bash does not parse the '<4' constraint as input redirection. Pass CMAKE_POLICY_VERSION_MINIMUM=3.5 to the Windows libyaml configure step, and disable fail-fast for the Windows libyaml matrix so one architecture does not hide the others.
1 parent 5a04f7f commit cc352d5

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
with:
146146
matrix_yaml: |
147147
include:
148-
- { platform: manylinux1, arch: x86_64, spec: cp38 }
148+
- { platform: manylinux1, arch: x86_64, spec: cp38, cibw_version: 'cibuildwheel<4' }
149149
- { platform: manylinux1, arch: x86_64, spec: cp39, omit: ${{ env.skip_ci_redundant_jobs }} }
150150
- { platform: manylinux2014, arch: x86_64, spec: cp310, omit: ${{ env.skip_ci_redundant_jobs }} }
151151
- { platform: manylinux2014, arch: x86_64, spec: cp311, omit: ${{ env.skip_ci_redundant_jobs }} }
@@ -237,7 +237,7 @@ jobs:
237237
set -eux
238238
239239
python3 -V
240-
python3 -m pip install -U --user ${{ matrix.cibw_version || 'cibuildwheel' }}
240+
python3 -m pip install -U --user "${{ matrix.cibw_version || 'cibuildwheel' }}"
241241
242242
mkdir pyyaml
243243
@@ -423,7 +423,7 @@ jobs:
423423
run: |
424424
set -eux
425425
python3 -V
426-
python3 -m pip install -U --user ${{ matrix.cibw_version || 'cibuildwheel' }}
426+
python3 -m pip install -U --user "${{ matrix.cibw_version || 'cibuildwheel' }}"
427427
mkdir pyyaml
428428
429429
tar zxf pyyaml*.tar.gz/pyyaml*.tar.gz --strip-components=1 -C pyyaml
@@ -450,6 +450,7 @@ jobs:
450450
name: libyaml windows ${{ matrix.arch }}
451451
runs-on: ${{ (matrix.arch == 'arm64') && 'windows-11-arm' || 'windows-2022' }}
452452
strategy:
453+
fail-fast: false
453454
matrix:
454455
include:
455456
- arch: x64
@@ -481,7 +482,7 @@ jobs:
481482
mkdir libyaml/build
482483
483484
pushd libyaml/build
484-
cmake.exe -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -DYAML_STATIC_LIB_NAME=yaml ..
485+
cmake.exe -G "Visual Studio 17 2022" -A ${{ matrix.arch }} -DYAML_STATIC_LIB_NAME=yaml -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
485486
cmake.exe --build . --config Release
486487
popd
487488
@@ -500,6 +501,7 @@ jobs:
500501
### x86_64 jobs
501502
- spec: cp38-win_amd64
502503
arch: x64
504+
cibw_version: cibuildwheel<4
503505
504506
- spec: cp39-win_amd64
505507
arch: x64
@@ -620,7 +622,7 @@ jobs:
620622
run: |
621623
set -eux
622624
python -V
623-
python -m pip install -U --user ${{ matrix.cibw_version || 'cibuildwheel' }}
625+
python -m pip install -U --user "${{ matrix.cibw_version || 'cibuildwheel' }}"
624626
mkdir pyyaml
625627
626628
tar zxf pyyaml*.tar.gz/pyyaml*.tar.gz --strip-components=1 -C pyyaml

0 commit comments

Comments
 (0)