From 9b1242e3606088453bcf57bd53ec1bc132cc05c7 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 20 Sep 2020 03:29:40 +1000
Subject: [PATCH] ci: extract to root on mac

---
 .github/workflows/ci.yml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86b5e1cdd..d25fba645 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,13 +18,15 @@ jobs:
             os: windows-latest
             dep-suffix: win.7z
             extract-tool: 7z x
+            cmake-gen: Ninja
           - build: 2
             build-type: RelWithDebInfo
             compiler-name: Clang LLVM
             os-name: macOS
             os: macos-latest
             dep-suffix: mac.zip
-            extract-tool: unzip
+            extract-tool: sudo unzip -d /
+            cmake-gen: "Unix Makefiles"
     name: |
       ${{ matrix.os-name }}
       <${{ matrix.compiler-name }},
@@ -153,22 +155,11 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{ runner.workspace }}/build
+      env:
+        CMAKE_GEN: ${{ matrix.cmake-gen }}
       run: |
         PATH=$GITHUB_WORKSPACE:$PATH \
-        OPENEXR_ROOT=$GITHUB_WORKSPACE \
-        FFMPEG_ROOT=$GITHUB_WORKSPACE \
-          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G Ninja
-      if: matrix.os == 'windows-latest'
-
-    - name: Configure CMake
-      shell: bash
-      working-directory: ${{ runner.workspace }}/build
-      run: |
-        PATH=$GITHUB_WORKSPACE:$PATH \
-        OPENEXR_ROOT=$GITHUB_WORKSPACE \
-        FFMPEG_ROOT=$GITHUB_WORKSPACE \
-          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }}
-      if: matrix.os == 'macos-latest'
+          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G $CMAKE_GEN
 
     - name: Build
       working-directory: ${{ runner.workspace }}/build