From 406c63533bd5f28e90b21bf3e14952f4509dc7e5 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sat, 3 Jun 2023 14:07:07 +0200 Subject: [PATCH] CI: pull swig from pypi instead of choco --- appveyor.yml | 3 ++- ci-build.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 41eaa718d70..48719d6586d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,8 @@ environment: image: - Visual Studio 2019 install: - - cmd: choco install swig -y --version 4.0.2.04082020 & exit 0 + - cmd: SET PATH=C:\Python310-x64;C:\Python310-x64\Scripts;%PATH% + - cmd: pip install swig==4.1.1 - cmd: curl -sSf -o rustup-init.exe https://win.rustup.rs/ - cmd: rustup-init.exe -y --default-toolchain 1.69.0 - cmd: curl -LO https://sdk.lunarg.com/sdk/download/1.2.189.2/windows/VulkanSDK-1.2.189.2-Installer.exe diff --git a/ci-build.cmake b/ci-build.cmake index 118347f02d6..693e2328c6f 100644 --- a/ci-build.cmake +++ b/ci-build.cmake @@ -66,7 +66,7 @@ if(DEFINED ENV{APPVEYOR}) -DQt6_DIR="C:\\Qt\\6.2\\msvc2019_64\\lib\\cmake\\Qt6") set(BUILD_DEPS TRUE) - set(SWIG_EXECUTABLE "C:\\ProgramData\\chocolatey\\bin\\swig.exe") + set(SWIG_EXECUTABLE "C:\\Python310-x64\\Scripts\\swig.exe") endif() if(DEFINED ENV{ANDROID})