From 3f906b40aa29186cea5e3c422eca36a7d24a3109 Mon Sep 17 00:00:00 2001 From: nulano Date: Sun, 25 Jun 2023 15:55:49 +0100 Subject: [PATCH] test using 64-bit Python --- .github/workflows/test-windows.yml | 2 +- winbuild/test_docker.ps1 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index c937b3e74a5..8e37d557340 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -230,7 +230,7 @@ jobs: - name: Test Wheel if: "github.event_name != 'pull_request'" run: | - docker run --rm -v ${env:GITHUB_WORKSPACE}:C:\pillow mcr.microsoft.com/windows/servercore:ltsc2022 powershell C:\pillow\winbuild\test_docker.ps1 ${{ matrix.python-version }} ${{ matrix.architecture }} + docker run --rm -v ${env:GITHUB_WORKSPACE}:C:\pillow mcr.microsoft.com/windows/servercore:ltsc2022 powershell C:\pillow\winbuild\test_docker.ps1 ${{ matrix.python-version }} shell: pwsh - name: Upload wheel diff --git a/winbuild/test_docker.ps1 b/winbuild/test_docker.ps1 index d161a511323..521c7a2376b 100644 --- a/winbuild/test_docker.ps1 +++ b/winbuild/test_docker.ps1 @@ -1,4 +1,4 @@ -param ([string]$python,[string]$arch) +param ([string]$python) $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' if ($python -like "pypy*") { @@ -10,8 +10,7 @@ if ($python -like "pypy*") { tar -xf 'pypy.zip' mv pypy*-win64 C:\Python } else { - $suffix = if ($arch -eq "x64") {"-amd64"} else {""} - $url = 'https://www.python.org/ftp/python/{0}.0/python-{0}.0{1}.exe' -f ($python, $suffix) + $url = 'https://www.python.org/ftp/python/{0}.0/python-{0}.0-amd64.exe' -f $python [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 Invoke-WebRequest -Uri $url -OutFile 'setup.exe' Start-Process setup.exe -Wait -NoNewWindow -PassThru -ArgumentList @(