diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index f123a4f22..ed32be26d 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -188,8 +188,9 @@ jobs: # trim ~150MB for each job - name: Optimize build cache if: steps.build-cache.outputs.cache-hit != 'true' - run: rmdir /S /Q winbuild\build\src - shell: cmd + run: | + rm -rf winbuild\build\src + shell: bash - name: Build Pillow run: | @@ -206,9 +207,7 @@ jobs: - name: Test Pillow run: | - path %GITHUB_WORKSPACE%\winbuild\build\bin;%PATH% .ci\test.cmd - shell: cmd - name: Prepare to upload errors if: failure() diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 82f1b5e90..20379c753 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -186,24 +186,18 @@ jobs: - name: Build wheels run: | - setlocal EnableDelayedExpansion - for %%f in (winbuild\build\license\*) do ( - set x=%%~nf - rem Skip FriBiDi license, it is not included in the wheel. - set fribidi=!x:~0,7! - if NOT !fribidi!==fribidi ( - rem Skip imagequant license, it is not included in the wheel. - set libimagequant=!x:~0,13! - if NOT !libimagequant!==libimagequant ( - echo. >> LICENSE - echo ===== %%~nf ===== >> LICENSE - echo. >> LICENSE - type %%f >> LICENSE - ) - ) - ) - call winbuild\\build\\build_env.cmd - %pythonLocation%\python.exe -m cibuildwheel . --output-dir wheelhouse + for f in winbuild/build/license/*; do + name=$(basename "${f%.*}") + # Skip FriBiDi license, it is not included in the wheel. + [[ $name == fribidi* ]] && continue + # Skip imagequant license, it is not included in the wheel. + [[ $name == libimagequant* ]] && continue + echo "" >> LICENSE + echo "===== $name =====" >> LICENSE + echo "" >> LICENSE + cat "$f" >> LICENSE + done + cmd //c "winbuild\\build\\build_env.cmd && $pythonLocation\\python.exe -m cibuildwheel . --output-dir wheelhouse" env: CIBW_ARCHS: ${{ matrix.cibw_arch }} CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd" @@ -217,7 +211,7 @@ jobs: -e CI -e GITHUB_ACTIONS mcr.microsoft.com/windows/servercore:ltsc2022 powershell C:\pillow\.github\workflows\wheels-test.ps1 %CD%\..\venv-test' - shell: cmd + shell: bash - name: Upload wheels uses: actions/upload-artifact@v6 diff --git a/.github/zizmor.yml b/.github/zizmor.yml index f4949c30c..100026562 100644 --- a/.github/zizmor.yml +++ b/.github/zizmor.yml @@ -1,7 +1,5 @@ # https://docs.zizmor.sh/configuration/ rules: - obfuscation: - disable: true unpinned-uses: config: policies: