From 9ed1a6eb301d30536b01115e3849191a558cce86 Mon Sep 17 00:00:00 2001 From: swamishiju Date: Mon, 7 Jul 2025 20:00:34 +0530 Subject: [PATCH] CI: Changed windows version --- .github/workflows/CI.yml | 12 +++++++++--- CMakeLists.txt | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7285607aae..a4f9e4ef6e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-latest", "macos-latest", "windows-2019"] + os: ["ubuntu-latest", "macos-latest", "windows-2025"] python-version: ["3.10"] steps: - uses: actions/checkout@v3 @@ -100,7 +100,10 @@ jobs: set WIN=1 set MACOS=0 set ENABLE_RUNTIME_STACKTRACE=no - call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + set CC=cl.exe + set CXX=cl.exe + set "PATH=%PATH:C:\mingw64\bin;=%" # Remove mingw from path xonsh ci\build.xsh - name: Test (Linux / macOS) @@ -119,7 +122,10 @@ jobs: set LFORTRAN_CMAKE_GENERATOR=Ninja set WIN=1 set MACOS=0 - call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + set CC=cl.exe + set CXX=cl.exe + set "PATH=%PATH:C:\mingw64\bin;=%" # Remove mingw from path xonsh ci\test.xsh build_to_wasm: diff --git a/CMakeLists.txt b/CMakeLists.txt index 828da11cd4..bf45744b4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,9 @@ include(GNUInstallDirs) # # cpack # -include(InstallRequiredSystemLibraries) +if(NOT WIN32) + include(InstallRequiredSystemLibraries) +endif() set(CPACK_GENERATOR "TBZ2") set(CPACK_STRIP_FILES YES) set(CPACK_PACKAGE_FILE_NAME lpython-${LFORTRAN_VERSION}-${CMAKE_SYSTEM_NAME})