Skip to content

Commit abb0984

Browse files
committed
Update CI
1 parent 7ab4142 commit abb0984

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

.github/workflows/windows-alt.yml

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ jobs:
1111
mingw:
1212
if: github.repository_owner == 'aws'
1313
runs-on: windows-latest
14+
env:
15+
CMAKE_BUILD_TYPE: Release
1416
steps:
1517
- name: Install NASM
1618
uses: ilammy/[email protected]
@@ -35,14 +37,15 @@ jobs:
3537
CMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
3638
CMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
3739
CMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
38-
CMAKE_BUILD_TYPE=Release \
3940
- name: Build Project
4041
run: cmake --build ./build --target all
4142
- name: Run tests
4243
run: cmake --build ./build --target run_tests
4344
clang:
4445
if: github.repository_owner == 'aws'
4546
runs-on: windows-latest
47+
env:
48+
CMAKE_BUILD_TYPE: Release
4649
steps:
4750
- name: Install NASM
4851
uses: ilammy/[email protected]
@@ -63,8 +66,6 @@ jobs:
6366
options: |
6467
CMAKE_SYSTEM_NAME=Windows \
6568
CMAKE_SYSTEM_PROCESSOR=x86_64 \
66-
CMAKE_MAKE_PROGRAM=ninja.exe \
67-
CMAKE_BUILD_TYPE=Release \
6869
- name: Build Project
6970
run: cmake --build ./build --target all
7071
- name: Run tests
@@ -78,12 +79,14 @@ jobs:
7879
- x64
7980
- x64_arm64
8081
runs-on: windows-latest
82+
env:
83+
CMAKE_GENERATOR: "Visual Studio 17 2022"
84+
CMAKE_GENERATOR_TOOLSET: "ClangCL,host=x64"
85+
CMAKE_BUILD_TYPE: Release
8186
steps:
8287
- if: ${{ matrix.target == 'x64' }}
8388
name: Install NASM
8489
uses: ilammy/[email protected]
85-
- name: Remove wrong clang-cl.exe
86-
run: rm "C:/Program Files/LLVM/bin/clang-cl.exe"
8790
- name: Checkout
8891
uses: actions/checkout@v4
8992
- uses: TheMrMilchmann/setup-msvc-dev@v3
@@ -92,32 +95,16 @@ jobs:
9295
- if: ${{ matrix.target == 'x64' }}
9396
name: Setup CMake
9497
uses: threeal/[email protected]
95-
with:
96-
generator: Ninja
97-
c-compiler: clang-cl
98-
cxx-compiler: clang-cl
99-
options: |
100-
CMAKE_CROSSCOMPILING=${{ ((matrix.target == 'x64') && '0') || '1' }} \
101-
CMAKE_SYSTEM_NAME=Windows \
102-
CMAKE_SYSTEM_PROCESSOR=x86_64 \
103-
CMAKE_BUILD_TYPE=Release \
10498
- if: ${{ matrix.target == 'x64_arm64' }}
10599
name: Setup CMake
106100
uses: threeal/[email protected]
107101
with:
108-
generator: Ninja
109-
c-compiler: clang-cl
110-
cxx-compiler: clang-cl
111102
options: |
112-
CMAKE_CROSSCOMPILING=1 \
103+
CMAKE_GENERATOR_PLATFORM=ARM64 \
113104
CMAKE_SYSTEM_NAME=Windows \
114105
CMAKE_SYSTEM_PROCESSOR=ARM64 \
115-
CMAKE_C_COMPILER_TARGET=arm64-pc-windows-msvc \
116-
CMAKE_ASM_COMPILER_TARGET=arm64-pc-windows-msvc \
117-
CMAKE_CXX_COMPILER_TARGET=arm64-pc-windows-msvc \
118-
CMAKE_BUILD_TYPE=Release \
119106
- name: Build Project
120-
run: cmake --build ./build --target all
107+
run: cmake --build ./build --target all_tests
121108
- if: ${{ matrix.target == 'x64' }}
122109
name: Run tests
123110
run: cmake --build ./build --target run_tests

0 commit comments

Comments
 (0)