Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
Loading