Skip to content

Commit 6843cf4

Browse files
committed
separate win msvc - 2
1 parent dced792 commit 6843cf4

File tree

1 file changed

+64
-27
lines changed

1 file changed

+64
-27
lines changed

Diff for: .github/workflows/main.yml

+64-27
Original file line numberDiff line numberDiff line change
@@ -890,16 +890,57 @@ jobs:
890890
cmake -S . -B build -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
891891
-D USE_SEQ=ON -D USE_MPI=OFF -D USE_OMP=OFF -D USE_TBB=ON -D USE_STL=ON
892892
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
893-
-D CMAKE_BUILD_TYPE=RELEASE
893+
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
894894
env:
895895
CC: clang-cl
896896
CXX: clang-cl
897897
- name: Build project
898898
run: |
899-
cmake --build build --config Release --parallel -v
899+
cmake --build build --config Release --parallel
900900
env:
901901
CC: clang-cl
902902
CXX: clang-cl
903+
- name: Install project
904+
run: |
905+
cmake --build build --target install
906+
- name: Archive installed package
907+
run: Compress-Archive -Path install -DestinationPath windows-clang-install.zip
908+
shell: pwsh
909+
- name: Upload installed package
910+
uses: actions/upload-artifact@v4
911+
with:
912+
name: windows-clang-install
913+
path: windows-clang-install.zip
914+
windows-clang-test:
915+
needs:
916+
- windows-clang-build
917+
runs-on: windows-latest
918+
defaults:
919+
run:
920+
shell: bash
921+
steps:
922+
- uses: actions/checkout@v4
923+
- name: Add msbuild to PATH
924+
uses: microsoft/setup-msbuild@v2
925+
with:
926+
vs-version: 'latest'
927+
- name: Setup MPI
928+
uses: mpi4py/setup-mpi@v1
929+
with:
930+
mpi: msmpi
931+
- name: Download dependencies
932+
uses: nick-fields/retry@v3
933+
with:
934+
timeout_minutes: 60
935+
max_attempts: 3
936+
command: choco install openssl --execution-timeout 3600
937+
- name: Download installed package
938+
uses: actions/download-artifact@v4
939+
with:
940+
name: windows-clang-install
941+
- name: Extract installed package
942+
run: Expand-Archive -Path .\windows-clang-install.zip -DestinationPath . -Force
943+
shell: pwsh
903944
- name: Run tests (threads, num_threads=1)
904945
run: python3 scripts/run_tests.py --running-type="threads"
905946
env:
@@ -920,40 +961,36 @@ jobs:
920961
env:
921962
OMP_NUM_THREADS: 4
922963
CLANG_BUILD: 1
923-
windows-clang-build-extended:
964+
windows-clang-test-extended:
924965
needs:
925-
- windows-clang-build
966+
- windows-clang-test
926967
runs-on: windows-latest
927968
defaults:
928969
run:
929970
shell: bash
930971
steps:
931972
- uses: actions/checkout@v4
932-
with:
933-
submodules: recursive
934973
- name: Add msbuild to PATH
935974
uses: microsoft/setup-msbuild@v2
936975
with:
937976
vs-version: 'latest'
938-
- name: Setup ninja
939-
uses: seanmiddleditch/gha-setup-ninja@v6
940-
- name: Setup MSVC for Ninja again
941-
uses: ilammy/msvc-dev-cmd@v1
942-
- name: CMake configure
943-
run: >
944-
cmake -S . -B build -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
945-
-D USE_SEQ=ON -D USE_MPI=OFF -D USE_OMP=OFF -D USE_TBB=ON -D USE_STL=ON
946-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
947-
-D CMAKE_BUILD_TYPE=RELEASE
948-
env:
949-
CC: clang-cl
950-
CXX: clang-cl
951-
- name: Build project
952-
run: |
953-
cmake --build build --config Release --parallel -v
954-
env:
955-
CC: clang-cl
956-
CXX: clang-cl
977+
- name: Setup MPI
978+
uses: mpi4py/setup-mpi@v1
979+
with:
980+
mpi: msmpi
981+
- name: Download dependencies
982+
uses: nick-fields/retry@v3
983+
with:
984+
timeout_minutes: 60
985+
max_attempts: 3
986+
command: choco install openssl --execution-timeout 3600
987+
- name: Download installed package
988+
uses: actions/download-artifact@v4
989+
with:
990+
name: windows-clang-install
991+
- name: Extract installed package
992+
run: Expand-Archive -Path .\windows-clang-install.zip -DestinationPath . -Force
993+
shell: pwsh
957994
- name: Run tests (threads, num_threads=5)
958995
run: python3 scripts/run_tests.py --running-type="threads"
959996
env:
@@ -1078,8 +1115,8 @@ jobs:
10781115
needs:
10791116
- ubuntu-gcc-build-codecov
10801117
- ubuntu-clang-sanitizer-test-extended
1081-
- windows-clang-build-extended
1082-
- windows-msvc-build-extended
1118+
- windows-clang-test-extended
1119+
- windows-msvc-test-extended
10831120
runs-on: ubuntu-24.04
10841121
steps:
10851122
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)