From 24a60f5ca1326c764f337278f60bc2b24254e95d Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 12:04:48 +1000
Subject: [PATCH 01/17] ci: use bash for package creation

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b6d547191..ab54af446 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,8 @@ jobs:
 
     - name: Create Package
       working-directory: ${{runner.workspace}}/build
-      run: mkdir olive-editor && copy app\olive-editor.exe olive-editor && windeployqt olive-editor\olive-editor.exe && copy %GITHUB_WORKSPACE%\bin\*.dll olive-editor
+      shell: bash
+      run: mkdir olive-editor && cp app/olive-editor.exe olive-editor && windeployqt olive-editor/olive-editor.exe && cp $GITHUB_WORKSPACE/bin/*.dll olive-editor
     
     - name: Deploy Portable
       working-directory: ${{runner.workspace}}/build/olive-editor

From 759211e8e8d1d6446cdf295829106c34bd0b41b6 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 12:19:47 +1000
Subject: [PATCH 02/17] ci: try tests after package creation

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab54af446..da54903fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,17 +73,17 @@ jobs:
       # Execute the build.  You can specify a specific target with "--target <NAME>"
       run: cmake --build . --config $BUILD_TYPE
 
+    - 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 $GITHUB_WORKSPACE/bin/*.dll olive-editor
+
     - name: Test
       working-directory: ${{runner.workspace}}/build
       shell: bash
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       run: ctest -C $BUILD_TYPE
-
-    - 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 $GITHUB_WORKSPACE/bin/*.dll olive-editor
     
     - name: Deploy Portable
       working-directory: ${{runner.workspace}}/build/olive-editor

From ff1737423728f96986239b70b022e8eea6ea73e8 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 12:39:09 +1000
Subject: [PATCH 03/17] ci: try acquiring deps in build directory

---
 .github/workflows/ci.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da54903fd..66f58e68c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,27 +34,35 @@ 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
@@ -65,7 +73,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:$PATH cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja"
+      run: PATH=$GITHUB_WORKSPACE/build:$PATH cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja"
 
     - name: Build
       working-directory: ${{runner.workspace}}/build
@@ -76,7 +84,7 @@ 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 $GITHUB_WORKSPACE/bin/*.dll olive-editor
+      run: mkdir olive-editor && cp app/olive-editor.exe olive-editor && windeployqt olive-editor/olive-editor.exe && cp bin/*.dll olive-editor
 
     - name: Test
       working-directory: ${{runner.workspace}}/build

From 89fb9f24b75512695d26aa7301b3fa7d7a914e27 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 12:43:26 +1000
Subject: [PATCH 04/17] Update README.md

---
 README.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index faf62793f..9b95c2b60 100644
--- a/README.md
+++ b/README.md
@@ -4,19 +4,15 @@ Olive is a free non-linear video editor for Windows, macOS, and Linux.
 
 ![screen](https://www.olivevideoeditor.org/img/screenshot.jpg)
 
-**Discover more:** [Website](https://www.olivevideoeditor.org/) | [Twitter](https://twitter.com/oliveteam) | [Discord](https://discord.gg/4Ae9KZn) | [Code Documentation](http://olivevideoeditor.org/doxygen/)
-
-**NOTE: The issue tracker is temporarily closed while Olive's core is getting rewritten. We apologize for any inconvenience. Please check back soon for the next release, as well as the [Patreon page](https://www.patreon.com/olivevideoeditor) for news and updates.**
-
-
+**Discover more:** [Website](https://www.olivevideoeditor.org/) | [Twitter](https://twitter.com/oliveteam) | [Discord](https://discord.gg/4Ae9KZn) | [Patreon](https://www.patreon.com/olivevideoeditor)
 
 ## Getting Started with Olive:
 
-Installation of Olive is available at: https://olivevideoeditor.org/download.php
+Binaries of Olive are available at: https://olivevideoeditor.org/download.php
 
-Instructions on how to use Olive are available on our wiki: https://github.com/olive-editor/olive/wiki/Overview-Guide
+Some tutorials can be seen on the GitHub Wiki: https://github.com/olive-editor/olive/wiki/Overview-Guide
 
-**NOTE: Olive is Alpha Software, and it should be treated as highly unstable. Work at your own risk.**
+**NOTE: Olive is alpha software and is considered highly unstable. While we highly appreciate users testing and providing usage information, please use at your own risk.**
 
 ## Support Olive:
 
@@ -24,10 +20,6 @@ Please consider supporting Olive:
 
 [![Become a Patron](https://olivevideoeditor.org/img/become_a_patron_button.png)](https://www.patreon.com/olivevideoeditor)
 
-**NOTE: It is strongly discouraged to use or compile the `master` branch in its current state as it's under heavy restructuring. Please use the 0.1.x code from the "Releases" tab instead.**
-
 ## Compiling from Source:
 
 Compiling instructions for Windows, macOS, and Linux can be found [on the main site](https://olivevideoeditor.org/compile.php).
-
-Olive has Doxygen-compatible documentation hosted at http://olivevideoeditor.org/doxygen/. You can also run `doxygen` in the source root directory to generate a local copy.

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 05/17] 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

From 64739e616243d2fb55eec6aca266cf1eaaf03834 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 13:14:01 +1000
Subject: [PATCH 06/17] ci: use cmd for portable file creation

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index daf27c62d..ffa445530 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,20 +73,21 @@ jobs:
       # Execute the build.  You can specify a specific target with "--target <NAME>"
       run: cmake --build . --config $BUILD_TYPE
 
-    - name: Create Package
-      working-directory: ${{runner.workspace}}/build
-      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
       shell: bash
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       run: ctest -C $BUILD_TYPE
+
+    - name: Create Package
+      working-directory: ${{runner.workspace}}/build
+      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: Deploy Portable
       working-directory: ${{runner.workspace}}/build/olive-editor
+      shell: cmd
       run: copy nul olive-editor\portable && 7z a Olive-Windows-x86_64.zip olive-editor
     
     - name: Upload artifact

From 39cbe8c402009055e15e70f5646a260474185c62 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 13:29:29 +1000
Subject: [PATCH 07/17] ci: test creating an empty file

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ffa445530..f7d419bb5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,6 +19,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      
+    - name: Create empty file
+      shell: cmd
+      run: type NUL > empty.txt
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory

From 44b1af28ee384c03348d6033e11822b93d7e6055 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 13:32:50 +1000
Subject: [PATCH 08/17] ci: fixed portable packaging (i think)

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7d419bb5..06e8350b9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,10 +19,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      
-    - name: Create empty file
-      shell: cmd
-      run: type NUL > empty.txt
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
@@ -90,9 +86,9 @@ jobs:
       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: Deploy Portable
-      working-directory: ${{runner.workspace}}/build/olive-editor
+      working-directory: ${{runner.workspace}}/build
       shell: cmd
-      run: copy nul olive-editor\portable && 7z a Olive-Windows-x86_64.zip olive-editor
+      run: type NUL > olive-editor\portable && 7z a Olive-Windows-x86_64.zip olive-editor
     
     - name: Upload artifact
       uses: actions/upload-artifact@v2

From 3d759ec606436fbccaa48e8f53909ffeca36a84c Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 14:15:14 +1000
Subject: [PATCH 09/17] ci: acquire runtime boost libraries

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06e8350b9..863e16aaf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,6 +56,9 @@ jobs:
   
     - name: Acquire zlib
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z
+  
+    - name: Acquire Boost
+      run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/boost-win.7z && 7z x boost-win.7z
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable

From 8c7d79fddf891ea1f57601ca4d5d07941e2bd93a Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 15:29:49 +1000
Subject: [PATCH 10/17] ci: attempt to create installer

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 863e16aaf..b74ab410d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,8 @@ jobs:
     # cross-platform coverage.
     # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
     runs-on: windows-latest
+    env:
+      PKGNAME: Olive-${GITHUB_SHA::8}-Windows-x86_64
 
     steps:
     - uses: actions/checkout@v2
@@ -88,13 +90,18 @@ jobs:
       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: Deploy Installer
+      working-directory: ${{runner.workspace}}/build
+      shell: cmd
+      run: copy %GITHUB_WORKSPACE%\app\packaging\windows\nsis\* . && "C:/Program Files (x86)/NSIS/makensis.exe" -V4 -DX64 "-XOutFile %PKGNAME%.exe" olive.nsi
+    
     - name: Deploy Portable
       working-directory: ${{runner.workspace}}/build
       shell: cmd
-      run: type NUL > olive-editor\portable && 7z a Olive-Windows-x86_64.zip olive-editor
+      run: type NUL > olive-editor\portable && 7z a %PKGNAME%.zip olive-editor
     
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
-        name: Olive-Windows-x86_64.zip
-        path: ${{runner.workspace}}/build/Olive-Windows-x86_64.zip
+        name: Windows (x86_64)
+        path: ${{runner.workspace}}/build/${PKGNAME}.*

From 4cca70f676a245e7843945b534bae7e2ce0ef599 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 15:48:08 +1000
Subject: [PATCH 11/17] ci: copy license in for installer

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b74ab410d..d7cc804c6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,7 +93,7 @@ jobs:
     - name: Deploy Installer
       working-directory: ${{runner.workspace}}/build
       shell: cmd
-      run: copy %GITHUB_WORKSPACE%\app\packaging\windows\nsis\* . && "C:/Program Files (x86)/NSIS/makensis.exe" -V4 -DX64 "-XOutFile %PKGNAME%.exe" olive.nsi
+      run: copy %GITHUB_WORKSPACE%\app\packaging\windows\nsis\* . && copy %GITHUB_WORKSPACE%\LICENSE . && "C:/Program Files (x86)/NSIS/makensis.exe" -V4 -DX64 "-XOutFile %PKGNAME%.exe" olive.nsi
     
     - name: Deploy Portable
       working-directory: ${{runner.workspace}}/build

From 33965838c55b056f2f24609904438929aa813af5 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 15:49:22 +1000
Subject: [PATCH 12/17] ci: package pdb symbol file too

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d7cc804c6..1bd188af4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
     - name: Create Package
       working-directory: ${{runner.workspace}}/build
       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
+      run: mkdir olive-editor && copy app\olive-editor.exe olive-editor && copy app\olive-editor.pdb olive-editor && windeployqt olive-editor\olive-editor.exe && copy %GITHUB_WORKSPACE%\bin\*.dll olive-editor
     
     - name: Deploy Installer
       working-directory: ${{runner.workspace}}/build

From 1e109cf9dfa4f0ef2e64db7d8fe100c5b4b3150e Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 16:10:41 +1000
Subject: [PATCH 13/17] ci: try to acquire crashpad

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1bd188af4..aec84237b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
     runs-on: windows-latest
     env:
-      PKGNAME: Olive-${GITHUB_SHA::8}-Windows-x86_64
+      PKGNAME: Olive-${{GITHUB_SHA::8}}-Windows-x86_64
 
     steps:
     - uses: actions/checkout@v2
@@ -61,6 +61,10 @@ jobs:
   
     - name: Acquire Boost
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/boost-win.7z && 7z x boost-win.7z
+      
+    - name: Acquire Crashpad
+      shell: cmd
+      run: git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && set PATH=%PATH%;%GITHUB_WORKSPACE%\depot_tools && fetch crashpad && cd crashpad && gn gen out/Default && sed -i "s/${cflags_c}/${cflags_c} \/MD/g" out\Default\toolchain.ninja && ninja.exe -C out/Default
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
@@ -70,7 +74,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:$PATH cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja"
+      run: PATH=$GITHUB_WORKSPACE:$GITHUB_WORKSPACE/crashpad:$PATH cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja"
 
     - name: Build
       working-directory: ${{runner.workspace}}/build

From 4af161d17a00a9468d7ebcfccfb9ab2d9a401ddb Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 17:59:08 +1000
Subject: [PATCH 14/17] ci: try to retrieve short hash

---
 .github/workflows/ci.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aec84237b..785c00a00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
     runs-on: windows-latest
     env:
-      PKGNAME: Olive-${{GITHUB_SHA::8}}-Windows-x86_64
+      PKGNAME: Olive-%HASH%-Windows-x86_64
 
     steps:
     - uses: actions/checkout@v2
@@ -88,15 +88,23 @@ jobs:
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       run: ctest -C $BUILD_TYPE
+      
+    - name: Get Git short hash
+      id: vars
+      run: echo ::set-output name=git_shorthash::$(git rev-parse --short=8 ${{github.sha}})
 
     - name: Create Package
       working-directory: ${{runner.workspace}}/build
       shell: cmd
+      env:
+        HASH: ${{steps.vars.outputs.git_shorthash}}
       run: mkdir olive-editor && copy app\olive-editor.exe olive-editor && copy app\olive-editor.pdb olive-editor && windeployqt olive-editor\olive-editor.exe && copy %GITHUB_WORKSPACE%\bin\*.dll olive-editor
     
     - name: Deploy Installer
       working-directory: ${{runner.workspace}}/build
       shell: cmd
+      env:
+        HASH: ${{steps.vars.outputs.git_shorthash}}
       run: copy %GITHUB_WORKSPACE%\app\packaging\windows\nsis\* . && copy %GITHUB_WORKSPACE%\LICENSE . && "C:/Program Files (x86)/NSIS/makensis.exe" -V4 -DX64 "-XOutFile %PKGNAME%.exe" olive.nsi
     
     - name: Deploy Portable

From 76112f708cebb1d4810390f653b9656d104867cd Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 15 Sep 2020 18:05:04 +1000
Subject: [PATCH 15/17] ci: try using absolute paths for crashpad compile

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 785c00a00..7e01572ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,10 @@ jobs:
       
     - name: Acquire Crashpad
       shell: cmd
-      run: git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && set PATH=%PATH%;%GITHUB_WORKSPACE%\depot_tools && fetch crashpad && cd crashpad && gn gen out/Default && sed -i "s/${cflags_c}/${cflags_c} \/MD/g" out\Default\toolchain.ninja && ninja.exe -C out/Default
+      run: |
+        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git |
+        && depot_tools\fetch crashpad && cd crashpad && ..\depot_tools\gn gen out/Default |
+        && sed -i "s/${cflags_c}/${cflags_c} \/MD/g" out\Default\toolchain.ninja && ninja.exe -C out/Default
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable

From 602788ce06abc29196a3c69b88d3a4f03f169ff8 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Wed, 16 Sep 2020 00:04:40 +1000
Subject: [PATCH 16/17] ci: fix syntax issue

---
 .github/workflows/ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e01572ba..864d4f050 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,9 +65,7 @@ jobs:
     - name: Acquire Crashpad
       shell: cmd
       run: |
-        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git |
-        && depot_tools\fetch crashpad && cd crashpad && ..\depot_tools\gn gen out/Default |
-        && sed -i "s/${cflags_c}/${cflags_c} \/MD/g" out\Default\toolchain.ninja && ninja.exe -C out/Default
+        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && depot_tools\fetch crashpad && cd crashpad && ..\depot_tools\gn gen out/Default && sed -i "s/${cflags_c}/${cflags_c} \/MD/g" out\Default\toolchain.ninja && ninja.exe -C out/Default
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable

From 67f0795795f2425e840b69bf6e124cb8430abbb7 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Wed, 16 Sep 2020 01:35:33 +1000
Subject: [PATCH 17/17] ci: set up python 2.7 for crashpad

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 864d4f050..9be7e10e8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,6 +61,12 @@ jobs:
   
     - name: Acquire Boost
       run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/boost-win.7z && 7z x boost-win.7z
+    
+    # Crashpad requires Python 2.7
+    - name: Set up Python 2.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
       
     - name: Acquire Crashpad
       shell: cmd