Merge branch 'master' into windows-ci-improvements
This commit is contained in:
+199
-112
@@ -15,28 +15,44 @@ jobs:
|
||||
build-type: RelWithDebInfo
|
||||
compiler-name: MSVC 16.x
|
||||
os-name: Windows
|
||||
os: windows-latest
|
||||
dep-suffix: win.7z
|
||||
extract-tool: 7z x
|
||||
- build: 2
|
||||
build-type: RelWithDebInfo
|
||||
compiler-name: Clang LLVM
|
||||
os-name: macOS
|
||||
os: macos-latest
|
||||
dep-suffix: mac.zip
|
||||
extract-tool: unzip
|
||||
name: |
|
||||
${{ matrix.os-name }}
|
||||
<${{ matrix.compiler-name }},
|
||||
${{ matrix.build-type }}>
|
||||
runs-on: windows-latest
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
steps:
|
||||
- name: Set package name
|
||||
shell: bash
|
||||
run: |
|
||||
echo "::set-env name=PKGNAME::$(echo Olive-${GITHUB_SHA::8}-Windows-x86_64)"
|
||||
- if: matrix.os == 'windows-latest'
|
||||
- name: Set package name
|
||||
shell: bash
|
||||
run: |
|
||||
echo "::set-env name=PKGNAME::$(echo Olive-${GITHUB_SHA::8}-Windows-x86_64)"
|
||||
|
||||
- if: matrix.os == 'macos-latest'
|
||||
- name: Set package name
|
||||
shell: bash
|
||||
run: |
|
||||
echo "::set-env name=PKGNAME::$(echo Olive-${GITHUB_SHA::8}-macOS)"
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Create Build Environment
|
||||
# Some projects don't allow in-source building, so create a separate build directory
|
||||
# We'll use this as our working directory for all subsequent commands
|
||||
run: |
|
||||
cmake -E make_directory ${{ runner.workspace }}/build
|
||||
|
||||
- name: Enable Developer Command Prompt
|
||||
uses: ilammy/msvc-dev-cmd@v1.3.0
|
||||
- if: matrix.os == 'windows-latest'
|
||||
- name: Enable Developer Command Prompt
|
||||
uses: ilammy/msvc-dev-cmd@v1.3.0
|
||||
|
||||
- name: Acquire Qt
|
||||
uses: jurplel/install-qt-action@v2.8.0
|
||||
@@ -44,63 +60,99 @@ jobs:
|
||||
version: 5.15.1
|
||||
|
||||
- name: Acquire FFmpeg
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z
|
||||
7z x ffmpeg-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-$DEP_SUFFIX
|
||||
7z x ffmpeg-$DEP_SUFFIX
|
||||
|
||||
- name: Acquire OpenColorIO
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ocio-win.7z
|
||||
7z x ocio-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ocio-$DEP_SUFFIX
|
||||
7z x ocio-$DEP_SUFFIX
|
||||
|
||||
- name: Acquire OpenEXR
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/openexr-win.7z
|
||||
7z x openexr-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/openexr-$DEP_SUFFIX
|
||||
7z x openexr-$DEP_SUFFIX
|
||||
|
||||
- name: Acquire OpenImageIO
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/oiio-win.7z
|
||||
7z x oiio-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/oiio-$DEP_SUFFIX
|
||||
7z x oiio-$DEP_SUFFIX
|
||||
|
||||
- name: Acquire libpng
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libpng-win.7z
|
||||
7z x libpng-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libpng-$DEP_SUFFIX
|
||||
7z x libpng-$DEP_SUFFIX
|
||||
|
||||
- name: Acquire libtiff
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libtiff-win.7z
|
||||
7z x libtiff-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libtiff-$DEP_SUFFIX
|
||||
7z x libtiff-$DEP_SUFFIX
|
||||
|
||||
- name: Acquire turbojpeg
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z
|
||||
7z x turbojpeg-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-$DEP_SUFFIX
|
||||
7z x turbojpeg-$DEP_SUFFIX
|
||||
|
||||
- name: Acquire zlib
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z
|
||||
7z x zlib-win.7z
|
||||
- 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 Boost
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/boost-win.7z
|
||||
7z x boost-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/boost-$DEP_SUFFIX
|
||||
7z x boost-$DEP_SUFFIX
|
||||
|
||||
- name: Acquire Crashpad
|
||||
shell: bash
|
||||
env:
|
||||
DEP_SUFFIX: ${{ matrix.dep-suffix }}
|
||||
EXTRACT_TOOL: ${{ matrix.extract-tool }}
|
||||
run: |
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/crashpad-win.7z
|
||||
7z x crashpad-win.7z
|
||||
curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/crashpad-$DEP_SUFFIX
|
||||
7z x crashpad-$DEP_SUFFIX
|
||||
|
||||
- name: Configure CMake
|
||||
# Use a bash shell so we can use the same syntax for environment variable
|
||||
# access regardless of the host operating system
|
||||
shell: bash
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
# 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=${{ matrix.build-type }} -G "Ninja"
|
||||
@@ -108,95 +160,130 @@ jobs:
|
||||
- name: Build
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
shell: bash
|
||||
# Execute the build. You can specify a specific target with "--target <NAME>"
|
||||
run: |
|
||||
cmake --build .
|
||||
|
||||
- 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 ${{ matrix.build-type }}
|
||||
|
||||
- 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: 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: 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: 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: Deploy Portable
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
shell: cmd
|
||||
run: |
|
||||
type NUL > olive-editor\portable
|
||||
7z a %PKGNAME%.zip olive-editor
|
||||
- name: Deploy Portable
|
||||
working-directory: ${{ runner.workspace }}/build
|
||||
shell: cmd
|
||||
run: |
|
||||
type NUL > olive-editor\portable
|
||||
7z a %PKGNAME%.zip olive-editor
|
||||
|
||||
- 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 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: 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: 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: 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: 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 Artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: ${{ env.PKGNAME }}.exe
|
||||
path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.exe
|
||||
- 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 Artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: ${{ env.PKGNAME }}.zip
|
||||
path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.zip
|
||||
- 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 == '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 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 Artifact to GitHub
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: ${{ env.PKGNAME }}.zip
|
||||
path: ${{ runner.workspace }}/build/${{ env.PKGNAME }}.zip
|
||||
|
||||
Reference in New Issue
Block a user