From 7b2f2e654da6fc69e980db007f2ac1d28e675053 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 17 Dec 2020 14:42:17 +0100
Subject: [PATCH] ci: gh-action windows fixes

---
 .github/workflows/cmake-build-ci.gen |  15 ++--
 .github/workflows/cmake-build-ci.yml | 105 ++++++++++++++-------------
 2 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 7fdb74ac..06bc0383 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -188,11 +188,12 @@ function steps_test() {
 ?>
       - name: Test
         if: env.BUILD_TESTING == 'ON'
-        run: |
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target install -- DESTDIR=/tmp
+        run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
+      - name: Install
+        if: env.BUILD_TESTING == 'ON'
+        run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp
       - name: Failed tests log
-        if: ${{ failure() }}
+        if: ${{ env.BUILD_TESTING == 'ON' && failure() }}
         run: cat build/Testing/Temporary/LastTest.log || true
 <?php
 }
@@ -205,10 +206,10 @@ function steps_package() {
         if: env.CC_VER == 'cur' && env.CMAKE_BUILD_TYPE == 'Release'
         run: |
           cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
 <?php
 }
 
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index dcaf81e3..8731ef00 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -99,11 +99,12 @@ jobs:
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
         if: env.BUILD_TESTING == 'ON'
-        run: |
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target install -- DESTDIR=/tmp
+        run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
+      - name: Install
+        if: env.BUILD_TESTING == 'ON'
+        run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp
       - name: Failed tests log
-        if: ${{ failure() }}
+        if: ${{ env.BUILD_TESTING == 'ON' && failure() }}
         run: cat build/Testing/Temporary/LastTest.log || true
       - name: Package
         env:
@@ -111,10 +112,10 @@ jobs:
         if: env.CC_VER == 'cur' && env.CMAKE_BUILD_TYPE == 'Release'
         run: |
           cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
       - name: Notify Gitter (success)
         if: ${{ success() && runner.os != 'Windows'}}
         run: |
@@ -192,11 +193,12 @@ jobs:
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
         if: env.BUILD_TESTING == 'ON'
-        run: |
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target install -- DESTDIR=/tmp
+        run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
+      - name: Install
+        if: env.BUILD_TESTING == 'ON'
+        run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp
       - name: Failed tests log
-        if: ${{ failure() }}
+        if: ${{ env.BUILD_TESTING == 'ON' && failure() }}
         run: cat build/Testing/Temporary/LastTest.log || true
       - name: Package
         env:
@@ -204,10 +206,10 @@ jobs:
         if: env.CC_VER == 'cur' && env.CMAKE_BUILD_TYPE == 'Release'
         run: |
           cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
       - name: Notify Gitter (success)
         if: ${{ success() && runner.os != 'Windows'}}
         run: |
@@ -284,11 +286,12 @@ jobs:
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
         if: env.BUILD_TESTING == 'ON'
-        run: |
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target install -- DESTDIR=/tmp
+        run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
+      - name: Install
+        if: env.BUILD_TESTING == 'ON'
+        run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp
       - name: Failed tests log
-        if: ${{ failure() }}
+        if: ${{ env.BUILD_TESTING == 'ON' && failure() }}
         run: cat build/Testing/Temporary/LastTest.log || true
       - name: Package
         env:
@@ -296,10 +299,10 @@ jobs:
         if: env.CC_VER == 'cur' && env.CMAKE_BUILD_TYPE == 'Release'
         run: |
           cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
       - name: Notify Gitter (success)
         if: ${{ success() && runner.os != 'Windows'}}
         run: |
@@ -378,11 +381,12 @@ jobs:
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
         if: env.BUILD_TESTING == 'ON'
-        run: |
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target install -- DESTDIR=/tmp
+        run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
+      - name: Install
+        if: env.BUILD_TESTING == 'ON'
+        run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp
       - name: Failed tests log
-        if: ${{ failure() }}
+        if: ${{ env.BUILD_TESTING == 'ON' && failure() }}
         run: cat build/Testing/Temporary/LastTest.log || true
       - name: Package
         env:
@@ -390,10 +394,10 @@ jobs:
         if: env.CC_VER == 'cur' && env.CMAKE_BUILD_TYPE == 'Release'
         run: |
           cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
       - name: Notify Gitter (success)
         if: ${{ success() && runner.os != 'Windows'}}
         run: |
@@ -471,11 +475,12 @@ jobs:
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
         if: env.BUILD_TESTING == 'ON'
-        run: |
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target install -- DESTDIR=/tmp
+        run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
+      - name: Install
+        if: env.BUILD_TESTING == 'ON'
+        run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp
       - name: Failed tests log
-        if: ${{ failure() }}
+        if: ${{ env.BUILD_TESTING == 'ON' && failure() }}
         run: cat build/Testing/Temporary/LastTest.log || true
       - name: Package
         env:
@@ -483,10 +488,10 @@ jobs:
         if: env.CC_VER == 'cur' && env.CMAKE_BUILD_TYPE == 'Release'
         run: |
           cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
       - name: Notify Gitter (success)
         if: ${{ success() && runner.os != 'Windows'}}
         run: |
@@ -571,11 +576,12 @@ jobs:
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
         if: env.BUILD_TESTING == 'ON'
-        run: |
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target install -- DESTDIR=/tmp
+        run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
+      - name: Install
+        if: env.BUILD_TESTING == 'ON'
+        run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp
       - name: Failed tests log
-        if: ${{ failure() }}
+        if: ${{ env.BUILD_TESTING == 'ON' && failure() }}
         run: cat build/Testing/Temporary/LastTest.log || true
       - name: Package
         env:
@@ -583,10 +589,10 @@ jobs:
         if: env.CC_VER == 'cur' && env.CMAKE_BUILD_TYPE == 'Release'
         run: |
           cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
       - name: Notify Gitter (success)
         if: ${{ success() && runner.os != 'Windows'}}
         run: |
@@ -736,11 +742,12 @@ jobs:
         run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
       - name: Test
         if: env.BUILD_TESTING == 'ON'
-        run: |
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target install -- DESTDIR=/tmp
+        run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
+      - name: Install
+        if: env.BUILD_TESTING == 'ON'
+        run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp
       - name: Failed tests log
-        if: ${{ failure() }}
+        if: ${{ env.BUILD_TESTING == 'ON' && failure() }}
         run: cat build/Testing/Temporary/LastTest.log || true
       - name: Package
         env:
@@ -748,10 +755,10 @@ jobs:
         if: env.CC_VER == 'cur' && env.CMAKE_BUILD_TYPE == 'Release'
         run: |
           cmake --config ${{ env.CMAKE_BUILD_TYPE }} -S . -B build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake -DCPACK_COMPONENT_INSTALL=ON build
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package -- VERBOSE=
-          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts -- VERBOSE=
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
+          cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
       - name: Notify Gitter (success)
         if: ${{ success() && runner.os != 'Windows'}}
         run: |
-- 
2.30.2