Skip to content

Commit 18ffcd3

Browse files
committed
Update .appveyor.yml to force platform-specific wheel
Because the MSYS people keep messing with their keys in ways that are not backwards-compatible and don't allow easy updating, the keyring and its installation method are also updated.
1 parent 412d8c2 commit 18ffcd3

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

.appveyor.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@ environment:
44
build: off
55
install:
66
- set PATH=C:\msys64\usr\bin;%PATH%
7-
# Load PGP Keys for Msys64
8-
- bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
9-
- bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
10-
- bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
11-
- bash -lc "pacman -U --noconfirm --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
12-
# Kill gpg-agent due to bug in MSYS
13-
- TaskKill /IM gpg-agent.exe /F
147
# Download and unpack zstd for win64 to unpack MSYS packages
158
- appveyor DownloadFile https://github.com/facebook/zstd/releases/download/v1.4.8/zstd-v1.4.8-win64.zip
169
- 7z e zstd-v1.4.8-win64.zip -ozstd -y
10+
# Load PGP Keys for Msys64
11+
- appveyor DownloadFile https://repo.msys2.org/msys/x86_64/msys2-keyring-1~20210213-2-any.pkg.tar.zst
12+
- appveyor DownloadFile https://repo.msys2.org/msys/x86_64/msys2-keyring-1~20210213-2-any.pkg.tar.zst.sig
13+
- dir
14+
- zstd\zstd.exe -d msys2-keyring-1~20210213-2-any.pkg.tar.zst
15+
- bash -lc "cd /c/projects/python-tksvg; ls -l; pacman -U --noconfirm --config <(echo) msys2-keyring-1~20210213-2-any.pkg.tar"
16+
# Verify signature AFTER updating the keyring because MSYS messes with keys too much
17+
- bash -lc "cd /c/projects/python-tksvg; ls -l; pacman-key --verify msys2-keyring-1~20210213-2-any.pkg.tar.zst.sig"
18+
# Kill gpg-agent due to bug in MSYS
19+
- START /wait taskkill /f /im gpg-agent.exe
1720
# Download and install zstd for MSYS due to bug in MSYS
1821
- appveyor DownloadFile http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.4.8-2-any.pkg.tar.zst
1922
- zstd\zstd.exe -d mingw-w64-x86_64-zstd-1.4.8-2-any.pkg.tar.zst
@@ -22,7 +25,6 @@ install:
2225
- bash -lc "cd /c/projects/python-tksvg; ls -l; pacman --noconfirm -U mingw-w64-x86_64-zstd-1.4.8-2-any.pkg.tar.gz"
2326
# Download and install pacman for MSYS due to bug in MSYS
2427
- appveyor DownloadFile http://repo.msys2.org/msys/x86_64/pacman-5.2.2-9-x86_64.pkg.tar.zst
25-
- 7z e zstd-v1.4.8-win64.zip -ozstd -y
2628
- zstd\zstd.exe -d pacman-5.2.2-9-x86_64.pkg.tar.zst
2729
- dir
2830
- 7z a -tgzip pacman-5.2.2-9-x86_64.pkg.tar.gz pacman-5.2.2-9-x86_64.pkg.tar
@@ -42,9 +44,9 @@ install:
4244
- 7z e Dependencies_x64_Release.zip -odeps -y
4345
# Add %PYTHON% to the path for libffi-7.dll
4446
- set PATH=%PYTHON%;C:\msys64\mingw64\lib;%PATH%
47+
- "%PYTHON%\\python.exe -m pip install -U pip setuptools wheel"
4548
build_script:
46-
- "%PYTHON%\\python.exe setup.py build bdist_wheel"
47-
- "%PYTHON%\\python.exe setup.py install"
49+
- "%PYTHON%\\python.exe setup.py build bdist_wheel --plat-name win_amd64"
4850
# Simplify PATH so as to test binary distribution
4951
- set PATH=C:\WINDOWS\system32;C:\WINDOWS
5052
test_script:

0 commit comments

Comments
 (0)