Skip to content

Commit f1304ee

Browse files
authored
Merge pull request #2861 from swamishiju/windows_update
CI: Changed windows version
2 parents e6f698f + 9ed1a6e commit f1304ee

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.github/workflows/CI.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: ["ubuntu-latest", "macos-latest", "windows-2019"]
22+
os: ["ubuntu-latest", "macos-latest", "windows-2025"]
2323
python-version: ["3.10"]
2424
steps:
2525
- uses: actions/checkout@v3
@@ -100,7 +100,10 @@ jobs:
100100
set WIN=1
101101
set MACOS=0
102102
set ENABLE_RUNTIME_STACKTRACE=no
103-
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
103+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
104+
set CC=cl.exe
105+
set CXX=cl.exe
106+
set "PATH=%PATH:C:\mingw64\bin;=%" # Remove mingw from path
104107
xonsh ci\build.xsh
105108
106109
- name: Test (Linux / macOS)
@@ -119,7 +122,10 @@ jobs:
119122
set LFORTRAN_CMAKE_GENERATOR=Ninja
120123
set WIN=1
121124
set MACOS=0
122-
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
125+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
126+
set CC=cl.exe
127+
set CXX=cl.exe
128+
set "PATH=%PATH:C:\mingw64\bin;=%" # Remove mingw from path
123129
xonsh ci\test.xsh
124130
125131
build_to_wasm:

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ include(GNUInstallDirs)
4242
#
4343
# cpack
4444
#
45-
include(InstallRequiredSystemLibraries)
45+
if(NOT WIN32)
46+
include(InstallRequiredSystemLibraries)
47+
endif()
4648
set(CPACK_GENERATOR "TBZ2")
4749
set(CPACK_STRIP_FILES YES)
4850
set(CPACK_PACKAGE_FILE_NAME lpython-${LFORTRAN_VERSION}-${CMAKE_SYSTEM_NAME})

0 commit comments

Comments
 (0)