Fix indention

This commit is contained in:
Simran Spiller
2020-09-23 00:47:34 +02:00
parent 68f40101f5
commit 31674e0a31
+127 -127
View File
@@ -31,153 +31,153 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: Checkout Source Code - name: Checkout Source Code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Automatically Generate Package Name - name: Automatically Generate Package Name
shell: bash shell: bash
env: env:
PLATFORM: ${{ matrix.os-name }} PLATFORM: ${{ matrix.os-name }}
ARCH: ${{ matrix.os-arch }} ARCH: ${{ matrix.os-arch }}
run: | run: |
echo "::set-env name=PKGNAME::$(echo Olive-${GITHUB_SHA::8}-${PLATFORM}-${ARCH})" echo "::set-env name=PKGNAME::$(echo Olive-${GITHUB_SHA::8}-${PLATFORM}-${ARCH})"
- name: Create Build Folder - name: Create Build Folder
run: | run: |
cmake -E make_directory ${{ runner.workspace }}/build cmake -E make_directory ${{ runner.workspace }}/build
- name: Enable Developer Command Prompt (Windows) - name: Enable Developer Command Prompt (Windows)
uses: ilammy/msvc-dev-cmd@v1.3.0 uses: ilammy/msvc-dev-cmd@v1.3.0
- name: Acquire Qt - name: Acquire Qt
uses: jurplel/install-qt-action@v2.8.0 uses: jurplel/install-qt-action@v2.8.0
with: with:
version: 5.15.1 version: 5.15.1
- name: Acquire FFmpeg - name: Acquire FFmpeg
shell: bash shell: bash
run: | run: |
$DOWNLOAD_TOOL http://olivevideoeditor.org/deps/ffmpeg-win.7z $DOWNLOAD_TOOL http://olivevideoeditor.org/deps/ffmpeg-win.7z
$EXTRACT_TOOL ffmpeg-win.7z $EXTRACT_TOOL ffmpeg-win.7z
- name: Acquire OpenColorIO - name: Acquire OpenColorIO
shell: bash shell: bash
run: | run: |
$DOWNLOAD_TOOL http://olivevideoeditor.org/deps/ocio-win.7z $DOWNLOAD_TOOL http://olivevideoeditor.org/deps/ocio-win.7z
$EXTRACT_TOOL ocio-win.7z $EXTRACT_TOOL ocio-win.7z
- name: Acquire OpenEXR - name: Acquire OpenEXR
shell: bash shell: bash
run: | run: |
$DOWNLOAD_TOOL http://olivevideoeditor.org/deps/openexr-win.7z $DOWNLOAD_TOOL http://olivevideoeditor.org/deps/openexr-win.7z
$EXTRACT_TOOL openexr-win.7z $EXTRACT_TOOL openexr-win.7z
- name: Acquire OpenImageIO - name: Acquire OpenImageIO
shell: bash shell: bash
run: | run: |
$DOWNLOAD_TOOL http://olivevideoeditor.org/deps/oiio-win.7z $DOWNLOAD_TOOL http://olivevideoeditor.org/deps/oiio-win.7z
$EXTRACT_TOOL oiio-win.7z $EXTRACT_TOOL oiio-win.7z
- name: Acquire Crashpad - name: Acquire Crashpad
shell: bash shell: bash
run: | run: |
$DOWNLOAD_TOOL http://olivevideoeditor.org/deps/crashpad-win.7z $DOWNLOAD_TOOL http://olivevideoeditor.org/deps/crashpad-win.7z
$EXTRACT_TOOL crashpad-win.7z $EXTRACT_TOOL crashpad-win.7z
- name: Configure CMake - name: Configure CMake
shell: bash shell: bash
working-directory: ${{ runner.workspace }}/build working-directory: ${{ runner.workspace }}/build
run: | run: |
PATH=$GITHUB_WORKSPACE:$PATH \ PATH=$GITHUB_WORKSPACE:$PATH \
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}"
- name: Build - name: Build
working-directory: ${{ runner.workspace }}/build working-directory: ${{ runner.workspace }}/build
shell: bash shell: bash
run: | run: |
cmake --build . cmake --build .
- name: Test - name: Test
working-directory: ${{ runner.workspace }}/build working-directory: ${{ runner.workspace }}/build
shell: bash shell: bash
run: | run: |
ctest -C ${{ matrix.build-type }} ctest -C ${{ matrix.build-type }}
- name: Create Package - name: Create Package
working-directory: ${{ runner.workspace }}/build working-directory: ${{ runner.workspace }}/build
shell: bash shell: bash
run: | run: |
mkdir olive-editor mkdir olive-editor
cp app/olive-editor.exe olive-editor cp app/olive-editor.exe olive-editor
cp app/olive-crashhandler.exe olive-editor cp app/olive-crashhandler.exe olive-editor
cp app/olive-editor.pdb olive-editor cp app/olive-editor.pdb olive-editor
windeployqt olive-editor/olive-crashhandler.exe windeployqt olive-editor/olive-crashhandler.exe
windeployqt olive-editor/olive-editor.exe windeployqt olive-editor/olive-editor.exe
cp $(cygpath $GITHUB_WORKSPACE)/bin/*.dll olive-editor cp $(cygpath $GITHUB_WORKSPACE)/bin/*.dll olive-editor
cp $(cygpath $GITHUB_WORKSPACE)/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $GITHUB_WORKSPACE)/out/Default/crashpad_handler.exe olive-editor
cp $(cygpath $GITHUB_WORKSPACE)/minidump_stackwalk/* olive-editor cp $(cygpath $GITHUB_WORKSPACE)/minidump_stackwalk/* olive-editor
- name: Deploy Packages - name: Deploy Packages
working-directory: ${{ runner.workspace }}/build working-directory: ${{ runner.workspace }}/build
shell: bash shell: bash
run: | run: |
# Create Installer Executable # Create Installer Executable
$DOWNLOAD_TOOL https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe $DOWNLOAD_TOOL https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe
cp $(cygpath $GITHUB_WORKSPACE)/app/packaging/windows/nsis/* . cp $(cygpath $GITHUB_WORKSPACE)/app/packaging/windows/nsis/* .
cp $(cygpath $GITHUB_WORKSPACE)/LICENSE . cp $(cygpath $GITHUB_WORKSPACE)/LICENSE .
makensis -V4 -DX64 "-XOutFile $PKGNAME.exe" olive.nsi makensis -V4 -DX64 "-XOutFile $PKGNAME.exe" olive.nsi
# Create Portable ZIP # Create Portable ZIP
echo -n > olive-editor/portable echo -n > olive-editor/portable
7z a $PKGNAME.zip olive-editor 7z a $PKGNAME.zip olive-editor
- name: Upload Installer Artifact to GitHub - name: Upload Installer Artifact to GitHub
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ env.PKGNAME }}.exe name: ${{ env.PKGNAME }}.exe
path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.exe path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.exe
- name: Upload Portable Artifact to GitHub - name: Upload Portable Artifact to GitHub
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ env.PKGNAME }}.zip name: ${{ env.PKGNAME }}.zip
path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.zip path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.zip
- name: Upload Packages to Nightly Page - name: Upload Packages to Nightly Page
shell: bash shell: bash
working-directory: ${{ runner.workspace }}/build working-directory: ${{ runner.workspace }}/build
env: env:
GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }} GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
if: github.event_name == 'push' if: github.event_name == 'push'
run: | run: |
curl -X POST \ curl -X POST \
-F file=@$PKGNAME.exe \ -F file=@$PKGNAME.exe \
-F key="$GH_AUTH_KEY" \ -F key="$GH_AUTH_KEY" \
-F hash="$GITHUB_SHA" \ -F hash="$GITHUB_SHA" \
-F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \ -F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \
-F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \ -F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \
https://olivevideoeditor.org/dl/push.php https://olivevideoeditor.org/dl/push.php
curl -X POST \ curl -X POST \
-F file=@$PKGNAME.zip \ -F file=@$PKGNAME.zip \
-F key="$GH_AUTH_KEY" \ -F key="$GH_AUTH_KEY" \
-F hash="$GITHUB_SHA" \ -F hash="$GITHUB_SHA" \
-F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \ -F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \
-F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \ -F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \
https://olivevideoeditor.org/dl/push.php https://olivevideoeditor.org/dl/push.php
- name: Export Crashpad Symbols and Upload To Server - name: Export Crashpad Symbols and Upload To Server
working-directory: ${{ runner.workspace }}/build working-directory: ${{ runner.workspace }}/build
shell: bash shell: bash
env: env:
GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }} GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
run: | run: |
curl -fLSs --retry 3 https://github.com/google/breakpad/blob/master/src/tools/windows/binaries/dump_syms.exe?raw=true > dump_syms.exe curl -fLSs --retry 3 https://github.com/google/breakpad/blob/master/src/tools/windows/binaries/dump_syms.exe?raw=true > dump_syms.exe
./dump_syms app/olive-editor.pdb > olive-editor.sym ./dump_syms app/olive-editor.pdb > olive-editor.sym
curl -X POST \ curl -X POST \
-F symfile=@olive-editor.sym \ -F symfile=@olive-editor.sym \
-F key="$GH_AUTH_KEY" \ -F key="$GH_AUTH_KEY" \
https://olivevideoeditor.org/crashpad/symbols.php https://olivevideoeditor.org/crashpad/symbols.php
macos: macos:
strategy: strategy: