ci: fixed indentation issue

2020-09-20 00:44:10 +10:00
parent 7c38ff74e2
commit cc8cbac532
1 changed files with 132 additions and 125 deletions
@@ -32,11 +32,11 @@ jobs:
    runs-on: ${{ matrix.os }}

    steps:
-      - name: Set package name
-        shell: bash
-        if: matrix.os == 'windows-latest'
-        run: |
-          echo "::set-env name=PKGNAME::$(echo Olive-${GITHUB_SHA::8}-Windows-x86_64)"
+    - name: Set package name
+      shell: bash
+      if: matrix.os == 'windows-latest'
+      run: |
+        echo "::set-env name=PKGNAME::$(echo Olive-${GITHUB_SHA::8}-Windows-x86_64)"

    - name: Set package name
      shell: bash
@@ -50,9 +50,9 @@ jobs:
      run: |
        cmake -E make_directory ${{ runner.workspace }}/build

-    - if: matrix.os == 'windows-latest'
-      - name: Enable Developer Command Prompt
-        uses: ilammy/msvc-dev-cmd@v1.3.0
+    - name: Enable Developer Command Prompt
+      uses: ilammy/msvc-dev-cmd@v1.3.0
+      if: matrix.os == 'windows-latest'

    - name: Acquire Qt
      uses: jurplel/install-qt-action@v2.8.0
@@ -122,15 +122,15 @@ jobs:
        curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-$DEP_SUFFIX
        7z x turbojpeg-$DEP_SUFFIX

-    - if: matrix.os == 'windows-latest'
-      - name: Acquire zlib
-        shell: bash
-        env:
-          DEP_SUFFIX: ${{ matrix.dep-suffix }}
-        EXTRACT_TOOL: ${{ matrix.extract-tool }}
-        run: |
-          curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-$DEP_SUFFIX
-          7z x zlib-$DEP_SUFFIX
+    - name: Acquire zlib
+      shell: bash
+      env:
+        DEP_SUFFIX: ${{ matrix.dep-suffix }}
+      EXTRACT_TOOL: ${{ matrix.extract-tool }}
+      run: |
+        curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-$DEP_SUFFIX
+        7z x zlib-$DEP_SUFFIX
+      if: matrix.os == 'windows-latest'

    - name: Acquire Boost
      shell: bash
@@ -169,121 +169,128 @@ jobs:
      run: |
        ctest -C ${{ matrix.build-type }}

-    - if: matrix.os == 'windows-latest'
-      - name: Create Package
-        working-directory: ${{ runner.workspace }}/build
-        shell: cmd
-        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: Create Package
+      working-directory: ${{ runner.workspace }}/build
+      shell: cmd
+      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
+      if: matrix.os == 'windows-latest'

-      - name: Deploy Installer
-        working-directory: ${{ runner.workspace }}/build
-        shell: cmd
-        run: |
-          copy %GITHUB_WORKSPACE%\app\packaging\windows\nsis\* .
-          copy %GITHUB_WORKSPACE%\LICENSE .
-          makensis -V4 -DX64 "-XOutFile %PKGNAME%.exe" olive.nsi
+    - name: Create Package
+      working-directory: ${{ runner.workspace }}/build
+      env:
+        BUNDLE_NAME: Olive.app
+      run: |
+        mv app/$BUNDLE_NAME .
+        macdeployqt $BUNDLE_NAME
+        curl -fLOSs --retry 3 https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
+        python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
+      if: matrix.os == 'macos-latest'

-      - name: Deploy Portable
-        working-directory: ${{ runner.workspace }}/build
-        shell: cmd
-        run: |
-          type NUL > olive-editor\portable
-          7z a %PKGNAME%.zip olive-editor
+    - name: Deploy Installer
+      working-directory: ${{ runner.workspace }}/build
+      shell: cmd
+      run: |
+        copy %GITHUB_WORKSPACE%\app\packaging\windows\nsis\* .
+        copy %GITHUB_WORKSPACE%\LICENSE .
+        makensis -V4 -DX64 "-XOutFile %PKGNAME%.exe" olive.nsi
+      if: matrix.os == 'windows-latest'

-      - name: Upload Installer to Nightly Page
-        shell: bash
-        working-directory: ${{ runner.workspace }}/build
-        env:
-          GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
-        run: |
-          curl -X POST \
-            -F file=@$PKGNAME.exe \
-            -F key="$GH_AUTH_KEY" \
-            -F hash="$GITHUB_SHA" \
-            -F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \
-            -F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \
-            https://olivevideoeditor.org/dl/push.php
-        if: github.event_name != 'pull_request'
+    - name: Deploy Portable
+      working-directory: ${{ runner.workspace }}/build
+      shell: cmd
+      run: |
+        type NUL > olive-editor\portable
+        7z a %PKGNAME%.zip olive-editor
+      if: matrix.os == 'windows-latest'

-      - name: Upload Portable to Nightly Page
-        shell: bash
-        working-directory: ${{ runner.workspace }}/build
-        env:
-          GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
-        run: |
-          curl -X POST \
-            -F file=@$PKGNAME.zip \
-            -F key="$GH_AUTH_KEY" \
-            -F hash="$GITHUB_SHA" \
-            -F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \
-            -F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \
-            https://olivevideoeditor.org/dl/push.php
-        if: github.event_name != 'pull_request'
+    - name: Deploy Package
+      working-directory: ${{ runner.workspace }}/build
+      run: |
+        zip -r $PKGNAME.zip $BUNDLE_NAME
+      if: matrix.os == 'macos-latest'

-      - name: Upload Installer Artifact to GitHub
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.PKGNAME }}.exe
-          path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.exe
+    - name: Upload Installer to Nightly Page
+      shell: bash
+      working-directory: ${{ runner.workspace }}/build
+      env:
+        GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
+      run: |
+        curl -X POST \
+          -F file=@$PKGNAME.exe \
+          -F key="$GH_AUTH_KEY" \
+          -F hash="$GITHUB_SHA" \
+          -F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \
+          -F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \
+          https://olivevideoeditor.org/dl/push.php
+      if: matrix.os == 'windows-latest' && github.event_name != 'pull_request'

-      - name: Upload Portable Artifact to GitHub
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.PKGNAME }}.zip
-          path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.zip
+    - name: Upload Portable to Nightly Page
+      shell: bash
+      working-directory: ${{ runner.workspace }}/build
+      env:
+        GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
+      run: |
+        curl -X POST \
+          -F file=@$PKGNAME.zip \
+          -F key="$GH_AUTH_KEY" \
+          -F hash="$GITHUB_SHA" \
+          -F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \
+          -F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \
+          https://olivevideoeditor.org/dl/push.php
+      if: matrix.os == 'windows-latest' && github.event_name != 'pull_request'

-      - name: Export Crashpad Symbols and Upload To Server
-        working-directory: ${{ runner.workspace }}/build
-        shell: cmd
-        env:
-          GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
-        run: |
-          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
-          curl -X POST ^
-            -F symfile=@olive-editor.sym ^
-            -F key="%GH_AUTH_KEY%" ^
-            https://olivevideoeditor.org/crashpad/symbols.php
+    - name: Upload Artifact to Nightly Page
+      shell: bash
+      working-directory: ${{ runner.workspace }}/build
+      env:
+        GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
+      run: |
+        curl -X POST \
+          -F file=@$PKGNAME.zip \
+          -F key="$GH_AUTH_KEY" \
+          -F hash="$GITHUB_SHA" \
+          -F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \
+          -F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \
+          https://olivevideoeditor.org/dl/push.php
+      if: matrix.os == 'macos-latest' && github.event_name != 'pull_request'

-    - if: matrix.os == 'macos-latest'
-      - name: Create Package
-        working-directory: ${{ runner.workspace }}/build
-        env:
-          BUNDLE_NAME: Olive.app
-        run: |
-          mv app/$BUNDLE_NAME .
-          macdeployqt $BUNDLE_NAME
-          curl -fLOSs --retry 3 https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
-          python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
-          
-      - name: Deploy Package
-        working-directory: ${{ runner.workspace }}/build
-        run: |
-          zip -r $PKGNAME.zip $BUNDLE_NAME
+    - name: Upload Installer Artifact to GitHub
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.PKGNAME }}.exe
+        path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.exe
+      if: matrix.os == 'windows-latest'

-      - name: Upload Artifact to Nightly Page
-        shell: bash
-        working-directory: ${{ runner.workspace }}/build
-        env:
-          GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
-        run: |
-          curl -X POST \
-            -F file=@$PKGNAME.zip \
-            -F key="$GH_AUTH_KEY" \
-            -F hash="$GITHUB_SHA" \
-            -F time="$(git -C $GITHUB_WORKSPACE show -s --format=%ct)" \
-            -F comment="$(git -C $GITHUB_WORKSPACE show -s --format=%B)" \
-            https://olivevideoeditor.org/dl/push.php
-        if: github.event_name != 'pull_request'
+    - name: Upload Portable Artifact to GitHub
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.PKGNAME }}.zip
+        path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.zip
+      if: matrix.os == 'windows-latest'

-      - name: Upload Artifact to GitHub
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.PKGNAME }}.zip
-          path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.zip
+    - name: Upload Artifact to GitHub
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.PKGNAME }}.zip
+        path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.zip
+      if: matrix.os == 'macos-latest'
+
+    - name: Export Crashpad Symbols and Upload To Server
+      working-directory: ${{ runner.workspace }}/build
+      shell: cmd
+      env:
+        GH_AUTH_KEY: ${{ secrets.GH_AUTH_KEY }}
+      run: |
+        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
+        curl -X POST ^
+          -F symfile=@olive-editor.sym ^
+          -F key="%GH_AUTH_KEY%" ^
+          https://olivevideoeditor.org/crashpad/symbols.php
+      if: matrix.os == 'windows-latest'