From e06b07283d187f152f6d80ac38989d4f4b8d5e6d Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 12:53:19 +1000
Subject: [PATCH] ci: sigh

---
 .github/workflows/ci.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66f58e68c..daf27c62d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,35 +34,27 @@ jobs:
         version: 5.15.1
       
     - name: Acquire FFmpeg
-      working-directory: ${{runner.workspace}}/build
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z && 7z x ffmpeg-win.7z
       
     - name: Acquire OpenColorIO
-      working-directory: ${{runner.workspace}}/build
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ocio-win.7z && 7z x ocio-win.7z
   
     - name: Acquire OpenEXR
-      working-directory: ${{runner.workspace}}/build
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/openexr-win.7z && 7z x openexr-win.7z
   
     - name: Acquire OpenImageIO
-      working-directory: ${{runner.workspace}}/build
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/oiio-win.7z && 7z x oiio-win.7z
   
     - name: Acquire libpng
-      working-directory: ${{runner.workspace}}/build
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libpng-win.7z && 7z x libpng-win.7z
   
     - name: Acquire libtiff
-      working-directory: ${{runner.workspace}}/build
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libtiff-win.7z && 7z x libtiff-win.7z
   
     - name: Acquire turbojpeg
-      working-directory: ${{runner.workspace}}/build
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z
   
     - name: Acquire zlib
-      working-directory: ${{runner.workspace}}/build
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z
 
     - name: Configure CMake
@@ -73,7 +65,7 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source 
       # and build directories, but this is only available with CMake 3.13 and higher.  
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: PATH=$GITHUB_WORKSPACE/build:$PATH cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja"
+      run: PATH=$GITHUB_WORKSPACE:$PATH cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja"
 
     - name: Build
       working-directory: ${{runner.workspace}}/build
@@ -83,8 +75,8 @@ jobs:
 
     - name: Create Package
       working-directory: ${{runner.workspace}}/build
-      shell: bash
-      run: mkdir olive-editor && cp app/olive-editor.exe olive-editor && windeployqt olive-editor/olive-editor.exe && cp bin/*.dll olive-editor
+      shell: cmd
+      run: mkdir olive-editor && copy app\olive-editor.exe olive-editor && windeployqt olive-editor\olive-editor.exe && copy %GITHUB_WORKSPACE%\bin\*.dll olive-editor
 
     - name: Test
       working-directory: ${{runner.workspace}}/build