]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
chore: Re-enable 64 bit msbuild ci jobs
authorRafael Kitover <rkitover@gmail.com>
Mon, 22 May 2023 22:19:22 +0000 (22:19 +0000)
committerJoel Rosdahl <joel@rosdahl.net>
Tue, 6 Jun 2023 19:32:17 +0000 (21:32 +0200)
Fixed by 70bf22a5 (fix: Disable masm on msbuild for blake3 with VS,
2023-05-22).

References #1278

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
.github/workflows/build.yaml

index f5dcfc75c9fe546f6f0143a2eb053da9a2b8dee0..4cd2791db508a302a128f2b2b13ad040802be6b8 100644 (file)
@@ -325,17 +325,16 @@ jobs:
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON
             TEST_CC: clang -target x86_64-pc-windows-msvc
 
-          # Issue: #1278
-          # - name: Windows VS2019 64-bit MSBuild
-          #   os: windows-2019
-          #   msvc_arch: x64
-          #   allow_test_failures: true  # For now, don't fail the build on failure
-          #   CC: cl
-          #   CXX: cl
-          #   ENABLE_CACHE_CLEANUP_TESTS: 1
-          #   CMAKE_GENERATOR: Visual Studio 16 2019
-          #   CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON -A x64
-          #   TEST_CC: clang -target x86_64-pc-windows-msvc
+          - name: Windows VS2019 64-bit MSBuild
+            os: windows-2019
+            msvc_arch: x64
+            allow_test_failures: true  # For now, don't fail the build on failure
+            CC: cl
+            CXX: cl
+            ENABLE_CACHE_CLEANUP_TESTS: 1
+            CMAKE_GENERATOR: Visual Studio 16 2019
+            CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON -A x64
+            TEST_CC: clang -target x86_64-pc-windows-msvc
 
           - name: Windows VS2022 32-bit Ninja
             os: windows-2022
@@ -370,17 +369,16 @@ jobs:
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON
             TEST_CC: clang -target x86_64-pc-windows-msvc
 
-          # Issue: #1278
-          # - name: Windows VS2022 64-bit MSBuild
-          #   os: windows-2022
-          #   msvc_arch: x64
-          #   allow_test_failures: true  # For now, don't fail the build on failure
-          #   CC: cl
-          #   CXX: cl
-          #   ENABLE_CACHE_CLEANUP_TESTS: 1
-          #   CMAKE_GENERATOR: Visual Studio 17 2022
-          #   CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON -A x64
-          #   TEST_CC: clang -target x86_64-pc-windows-msvc
+          - name: Windows VS2022 64-bit MSBuild
+            os: windows-2022
+            msvc_arch: x64
+            allow_test_failures: true  # For now, don't fail the build on failure
+            CC: cl
+            CXX: cl
+            ENABLE_CACHE_CLEANUP_TESTS: 1
+            CMAKE_GENERATOR: Visual Studio 17 2022
+            CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON -A x64
+            TEST_CC: clang -target x86_64-pc-windows-msvc
 
           - name: Clang address & UB sanitizer
             os: ubuntu-20.04