diff --git a/appveyor.yml b/appveyor.yml index 07ef5c798d67a46945803bad61a6cc3287f96701..01b90214d6a0fb3c142d6284fe86fb1dfb688f43 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +image: Visual Studio 2019 + environment: matrix: - MSYSTEM: MINGW64 @@ -19,11 +21,6 @@ clone_depth: 1 install: - set PATH=C:\msys64\usr\bin;%PATH% - # Download new keyring until appveyor updates its installation - - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" - - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" - - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" - - bash -lc "pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz --noconfirm" - bash -lc "pacman --needed --noconfirm -Syu" # This is needed because without killing all processes -Su will fail - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process diff --git a/win/misc/create-launcher.py b/win/misc/create-launcher.py index 848ab059176a341e88fe73b4ee8e1dff84b0fa31..eadee14e689149c8c17f89e4736bf8bacb49597a 100644 --- a/win/misc/create-launcher.py +++ b/win/misc/create-launcher.py @@ -136,6 +136,7 @@ def get_resouce_code(filename, file_version, file_desc, icon_path, """ def to_ver_list(v): + v = v.replace('-dev', '.') return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4])) file_version_list = to_ver_list(file_version)