Merge branch 'master' of https://github.com/olive-editor/olive

.github/workflows/ci.yml

@@ -16,8 +16,6 @@ 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-%HASH%-Windows-x86_64
 
     steps:
     - uses: actions/checkout@v2
@@ -61,17 +59,9 @@ 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
-      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
+      run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/crashpad-win.7z && 7z x crashpad-win.7z
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
@@ -81,7 +71,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:$GITHUB_WORKSPACE/crashpad:$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
@@ -96,31 +86,31 @@ jobs:
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       run: ctest -C $BUILD_TYPE
       
-    - name: Get Git short hash
+    - name: Generate Package Name
       id: vars
-      run: echo ::set-output name=git_shorthash::$(git rev-parse --short=8 ${{github.sha}})
+      run: echo ::set-output name=pkgname::Olive-$(git rev-parse --short=8 ${{github.sha}})-Windows-x86_64
 
     - 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
+      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 && copy %GITHUB_WORKSPACE%\out\Default\crashpad_handler.exe olive-editor
     
     - name: Deploy Installer
       working-directory: ${{runner.workspace}}/build
       shell: cmd
       env:
-        HASH: ${{steps.vars.outputs.git_shorthash}}
+        PKGNAME: ${{steps.vars.outputs.pkgname}}
       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
       shell: cmd
+      env:
+        PKGNAME: ${{steps.vars.outputs.pkgname}}
       run: type NUL > olive-editor\portable && 7z a %PKGNAME%.zip olive-editor
     
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: Windows (x86_64)
-        path: ${{runner.workspace}}/build/${PKGNAME}.*
+        path: ${{runner.workspace}}/build/${{steps.vars.outputs.pkgname}}.*