Skip to content

Commit f0a34f6

Browse files
authored
Merge pull request #1092 from ldorau/Revert_Temporarily_disable_failing_windows-2022_clang_CI_job
Revert "Temporarily disable failing windows-2022 clang CI job"
2 parents f6cbe83 + a2a9ba8 commit f0a34f6

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,14 @@ jobs:
226226
level_zero_provider: ['ON']
227227
cuda_provider: ['ON']
228228
include:
229-
# temporarily disable failing CI job
230-
#- os: 'windows-2022'
231-
# build_type: Release
232-
# compiler: {c: clang-cl, cxx: clang-cl}
233-
# shared_library: 'ON'
234-
# level_zero_provider: 'ON'
235-
# cuda_provider: 'ON'
236-
# toolset: "-T ClangCL"
229+
- os: 'windows-2019'
230+
# clang build fails on Windows 2022
231+
build_type: Release
232+
compiler: {c: clang-cl, cxx: clang-cl}
233+
shared_library: 'ON'
234+
level_zero_provider: 'ON'
235+
cuda_provider: 'ON'
236+
toolset: "-T ClangCL"
237237
- os: 'windows-2022'
238238
build_type: Release
239239
compiler: {c: cl, cxx: cl}

src/coarse/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Copyright (C) 2024 Intel Corporation
1+
# Copyright (C) 2024-2025 Intel Corporation
22
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

55
include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
66

77
set(COARSE_SOURCES coarse.c ../ravl/ravl.c)
88

9-
if(UMF_BUILD_SHARED_LIBRARY)
9+
if(UMF_BUILD_SHARED_LIBRARY AND (NOT WINDOWS))
1010
set(COARSE_EXTRA_SRCS ${BA_SOURCES})
1111
set(COARSE_EXTRA_LIBS $<BUILD_INTERFACE:umf_utils>)
1212
endif()

0 commit comments

Comments
 (0)