From 2011a08c444362dd8ff50f2b687e51aa5a652e84 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Mon, 4 Oct 2021 00:21:26 -0700
Subject: [PATCH] Update ci.yml

---
 .github/workflows/ci.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb193eadc..7e8f0f9f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -192,22 +192,24 @@ jobs:
           ninja install
           echo "$(pwd -W)/install" >> $GITHUB_PATH
           echo "$(pwd -W)/install/bin" >> $GITHUB_PATH
+          dir $(pwd -W)/install/bin
 
       # Should write a package script for this some day
       - name: Acquire OpenTimelineIO
         shell: bash
         working-directory: ${{ runner.workspace }}
         run: |
-          git clone --depth 1 --branch v0.13 https://github.com/PixarAnimationStudios/OpenTimelineIO.git
+          git clone --depth 1 https://github.com/PixarAnimationStudios/OpenTimelineIO.git
           cd OpenTimelineIO
           mkdir build
           cd build
           cmake .. -DOTIO_PYTHON_INSTALL=OFF -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \
             -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \
             -DCMAKE_INSTALL_PREFIX="$(pwd -W)/install"
-            ninja install
-            echo "$(pwd -W)/install" >> $GITHUB_PATH
-            echo "$(pwd -W)/install/bin" >> $GITHUB_PATH
+          ninja install
+          echo "$(pwd -W)/install" >> $GITHUB_PATH
+          echo "$(pwd -W)/install/bin" >> $GITHUB_PATH
+          dir $(pwd -W)/install/bin
 
       - name: Acquire Google Crashpad
         shell: bash
@@ -251,6 +253,8 @@ jobs:
       - name: Create Package
         working-directory: ${{ runner.workspace }}/build
         shell: bash
+        env:
+          ORIGINAL_WORKSPACE: ${{ runner.workspace }}
         run: |
           mkdir olive-editor
           cp app/olive-editor.exe olive-editor
@@ -259,11 +263,11 @@ jobs:
           $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe
           $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe
           cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor
-          cp $(cygpath $GITHUB_WORKSPACE)/OpenColorIO/build/install/bin/*.dll olive-editor
-          cp $(cygpath $GITHUB_WORKSPACE)/OpenTimelineIO/build/install/bin/*.dll olive-editor
-          cp $(cygpath $GITHUB_WORKSPACE)/install/bin/*.dll olive-editor
-          cp $(cygpath $GITHUB_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor
-          cp $(cygpath $GITHUB_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor
+          cp $(cygpath $ORIGINAL_WORKSPACE)/OpenColorIO/build/install/bin/*.dll olive-editor
+          cp $(cygpath $ORIGINAL_WORKSPACE)/OpenTimelineIO/build/install/bin/*.dll olive-editor
+          cp $(cygpath $ORIGINAL_WORKSPACE)/install/bin/*.dll olive-editor
+          cp $(cygpath $ORIGINAL_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor
+          cp $(cygpath $ORIGINAL_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor
 
       - name: Export Crashpad symbols
         working-directory: ${{ runner.workspace }}/build