From e02d2c7d3366e37ac02e5127026f38248c1defd6 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 01:54:54 -0700 Subject: [PATCH 01/30] acquire deps with vcpkg --- .github/workflows/ci.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f09fb3b3..a0a571f3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,11 +169,14 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: Acquire Dependencies - shell: bash - working-directory: ${{ runner.workspace }} + uses: lukka/run-vcpkg@v7 + with: + setupOnly: true + env: + VCPKG_DEFAULT_TRIPLET: x64-windows run: | - $DOWNLOAD_TOOL https://github.com/olive-editor/dependencies/releases/download/continuous/olive-dep-win32.tar.gz - tar xzf olive-dep-win32.tar.gz + $VCPKG_ROOT/vcpkg install qt5 ffmpeg openexr openimageio opencolorio portaudio --triplet=x64-windows-rel + shell: bash - name: Acquire Google Crashpad shell: bash @@ -198,7 +201,7 @@ jobs: DEP_LOCATION: ${{ runner.workspace }}/install working-directory: ${{ runner.workspace }}/build run: | - PATH=$DEP_LOCATION:$DEP_LOCATION/crashpad:$PATH \ + PATH=$DEP_LOCATION/crashpad:$PATH \ cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" - name: Build From 84ab522bd8ea0cc46eafbe899eff3eaaf43df181 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 01:56:35 -0700 Subject: [PATCH 02/30] separate steps --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0a571f3a..66a02cc27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -168,15 +168,17 @@ jobs: - name: Enable Developer Command Prompt (Windows) uses: ilammy/msvc-dev-cmd@v1 - - name: Acquire Dependencies + - name: Set up vcpkg and restore cache uses: lukka/run-vcpkg@v7 with: setupOnly: true env: VCPKG_DEFAULT_TRIPLET: x64-windows + + - name: Acquire Dependencies + shell: bash run: | $VCPKG_ROOT/vcpkg install qt5 ffmpeg openexr openimageio opencolorio portaudio --triplet=x64-windows-rel - shell: bash - name: Acquire Google Crashpad shell: bash From 3fe7f3e28316140c06e99d04c7a3b9be5e8436f0 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 02:01:26 -0700 Subject: [PATCH 03/30] try setting commit id --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66a02cc27..6c36e55b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -172,6 +172,7 @@ jobs: uses: lukka/run-vcpkg@v7 with: setupOnly: true + vcpkgGitCommitId: 2a31089e777fc187f1cc05338250b8e1810cfb52 env: VCPKG_DEFAULT_TRIPLET: x64-windows From 9b0af75ac279de005796280d73a67c0104c7167c Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 02:03:13 -0700 Subject: [PATCH 04/30] correct triplet --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c36e55b6..0895fd900 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,13 +173,10 @@ jobs: with: setupOnly: true vcpkgGitCommitId: 2a31089e777fc187f1cc05338250b8e1810cfb52 - env: - VCPKG_DEFAULT_TRIPLET: x64-windows - - name: Acquire Dependencies shell: bash run: | - $VCPKG_ROOT/vcpkg install qt5 ffmpeg openexr openimageio opencolorio portaudio --triplet=x64-windows-rel + $VCPKG_ROOT/vcpkg install qt5 ffmpeg openexr openimageio opencolorio portaudio --triplet=x64-windows - name: Acquire Google Crashpad shell: bash From 588379ffd7d82838ff3fe5843f28ec90e1236a2f Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 09:28:03 -0700 Subject: [PATCH 05/30] clean after build --- .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 0895fd900..b634d01fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -176,7 +176,7 @@ jobs: - name: Acquire Dependencies shell: bash run: | - $VCPKG_ROOT/vcpkg install qt5 ffmpeg openexr openimageio opencolorio portaudio --triplet=x64-windows + $VCPKG_ROOT/vcpkg install qt5 ffmpeg openexr openimageio opencolorio portaudio --triplet=x64-windows --clean-after-build - name: Acquire Google Crashpad shell: bash From df2c9c3cf14d7f5f80592ef3c3b337f66bcddd0d Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 13:52:44 -0700 Subject: [PATCH 06/30] try adding vcpkg toolchain file --- .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 b634d01fa..c6dc259c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,7 +202,8 @@ jobs: working-directory: ${{ runner.workspace }}/build run: | PATH=$DEP_LOCATION/crashpad:$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 }}" \ + -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" - name: Build working-directory: ${{ runner.workspace }}/build From cfc4e9aae871589156b9a678cd76e7026078d53f Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 14:15:01 -0700 Subject: [PATCH 07/30] try using action's parameters for better caching --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6dc259c8..14cf86536 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -171,12 +171,9 @@ jobs: - name: Set up vcpkg and restore cache uses: lukka/run-vcpkg@v7 with: - setupOnly: true vcpkgGitCommitId: 2a31089e777fc187f1cc05338250b8e1810cfb52 - - name: Acquire Dependencies - shell: bash - run: | - $VCPKG_ROOT/vcpkg install qt5 ffmpeg openexr openimageio opencolorio portaudio --triplet=x64-windows --clean-after-build + vcpkgTriplet: x64-windows + vcpkgArguments: qt5 ffmpeg openexr openimageio opencolorio portaudio - name: Acquire Google Crashpad shell: bash From 0800b32861f0d299902980d2a41966447b0b7cf4 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 19:01:52 -0700 Subject: [PATCH 08/30] path for crashpad --- .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 14cf86536..33bf083f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -198,7 +198,7 @@ jobs: DEP_LOCATION: ${{ runner.workspace }}/install working-directory: ${{ runner.workspace }}/build run: | - PATH=$DEP_LOCATION/crashpad:$PATH \ + PATH=$DEP_LOCATION:$DEP_LOCATION/crashpad:$PATH \ cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" From eeacf5c84e3b5e8b9f9b562c98a626725ac9ee01 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 19:57:17 -0700 Subject: [PATCH 09/30] try no path to windeployqt Not sure if it's already in the path or if we'll need to add it manually --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33bf083f0..60ec0f78d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -226,8 +226,8 @@ jobs: cp app/olive-editor.exe olive-editor cp app/crashhandler/olive-crashhandler.exe olive-editor cp app/olive-editor.pdb olive-editor - $DEP_LOCATION/bin/windeployqt olive-editor/olive-crashhandler.exe - $DEP_LOCATION/bin/windeployqt olive-editor/olive-editor.exe + windeployqt olive-editor/olive-crashhandler.exe + windeployqt olive-editor/olive-editor.exe cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor From f8a61295ae3c758a94068877f99200213b499b03 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 20:23:55 -0700 Subject: [PATCH 10/30] i think this is the right path --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60ec0f78d..dc784bdf4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -226,8 +226,8 @@ jobs: cp app/olive-editor.exe olive-editor cp app/crashhandler/olive-crashhandler.exe olive-editor cp app/olive-editor.pdb olive-editor - windeployqt olive-editor/olive-crashhandler.exe - windeployqt olive-editor/olive-editor.exe + $VCPKG_ROOT/installed/x64-windows/bin/windeployqt olive-editor/olive-crashhandler.exe + $VCPKG_ROOT/installed/x64-windows/bin/windeployqt olive-editor/olive-editor.exe cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor From 47ca095c74d57bea3fb9793d39cd2b030a525f22 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 2 Oct 2021 23:11:39 -0700 Subject: [PATCH 11/30] try this --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc784bdf4..d6db18217 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,7 +173,7 @@ jobs: with: vcpkgGitCommitId: 2a31089e777fc187f1cc05338250b8e1810cfb52 vcpkgTriplet: x64-windows - vcpkgArguments: qt5 ffmpeg openexr openimageio opencolorio portaudio + vcpkgArguments: qt5-base qt5-tools ffmpeg openexr openimageio opencolorio portaudio - name: Acquire Google Crashpad shell: bash @@ -226,8 +226,8 @@ jobs: cp app/olive-editor.exe olive-editor cp app/crashhandler/olive-crashhandler.exe olive-editor cp app/olive-editor.pdb olive-editor - $VCPKG_ROOT/installed/x64-windows/bin/windeployqt olive-editor/olive-crashhandler.exe - $VCPKG_ROOT/installed/x64-windows/bin/windeployqt olive-editor/olive-editor.exe + $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt olive-editor/olive-crashhandler.exe + $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt olive-editor/olive-editor.exe cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor From 7925351cedc975368e629bda1b54587bdd134655 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 10:03:18 -0700 Subject: [PATCH 12/30] missing dll, maybe try whole qt5 again --- .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 d6db18217..3daa670c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,7 +173,7 @@ jobs: with: vcpkgGitCommitId: 2a31089e777fc187f1cc05338250b8e1810cfb52 vcpkgTriplet: x64-windows - vcpkgArguments: qt5-base qt5-tools ffmpeg openexr openimageio opencolorio portaudio + vcpkgArguments: qt5 ffmpeg openexr openimageio opencolorio portaudio - name: Acquire Google Crashpad shell: bash From 0bbefb45925d60122b48f85c453b949e52ce7ec6 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 11:22:38 -0700 Subject: [PATCH 13/30] don't deploy angle --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3daa670c9..fd6cefa08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -226,8 +226,8 @@ jobs: cp app/olive-editor.exe olive-editor cp app/crashhandler/olive-crashhandler.exe olive-editor cp app/olive-editor.pdb olive-editor - $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt olive-editor/olive-crashhandler.exe - $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt olive-editor/olive-editor.exe + $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe + $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor From 9e26c0c798141ede8ef7789f9b764d333fecde8d Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 11:50:08 -0700 Subject: [PATCH 14/30] add more dlls --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd6cefa08..6afeb0467 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -228,6 +228,7 @@ jobs: cp app/olive-editor.pdb olive-editor $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe + $VCPKG_ROOT/installed/x64-windows/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor From 88e9122507b49fd5c24969bf5d26a144b2798675 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 12:25:32 -0700 Subject: [PATCH 15/30] actually copy --- .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 6afeb0467..05f3141d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -228,7 +228,7 @@ jobs: cp app/olive-editor.pdb olive-editor $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe - $VCPKG_ROOT/installed/x64-windows/bin/*.dll olive-editor + cp $VCPKG_ROOT/installed/x64-windows/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor From 4c8512a80854336eaee2a9a6af3fb9c34e928cf9 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 12:48:25 -0700 Subject: [PATCH 16/30] show me where the files are --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05f3141d4..7e62b61a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,6 +175,11 @@ jobs: vcpkgTriplet: x64-windows vcpkgArguments: qt5 ffmpeg openexr openimageio opencolorio portaudio + - name: Show me directory + shell: bash + run: | + ls -R $VCPKG_ROOT/installed/x64-windows + - name: Acquire Google Crashpad shell: bash working-directory: ${{ runner.workspace }} From d0ca24b67e2e821da764d65e57a0529ed0a393e5 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 12:53:14 -0700 Subject: [PATCH 17/30] use cygpath on copy --- .github/workflows/ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e62b61a6..202185f17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,11 +175,6 @@ jobs: vcpkgTriplet: x64-windows vcpkgArguments: qt5 ffmpeg openexr openimageio opencolorio portaudio - - name: Show me directory - shell: bash - run: | - ls -R $VCPKG_ROOT/installed/x64-windows - - name: Acquire Google Crashpad shell: bash working-directory: ${{ runner.workspace }} @@ -233,7 +228,7 @@ jobs: cp app/olive-editor.pdb olive-editor $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe - cp $VCPKG_ROOT/installed/x64-windows/bin/*.dll olive-editor + cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor From e10d12e0d2540b992ea71a1bda7e5aa62a9db820 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 18:13:56 -0700 Subject: [PATCH 18/30] ci: build our own ocio We require the Unicode fix, so until upstream merges it, we must compile it ourselves --- .github/workflows/ci.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 202185f17..b6a1e0132 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,7 +173,22 @@ jobs: with: vcpkgGitCommitId: 2a31089e777fc187f1cc05338250b8e1810cfb52 vcpkgTriplet: x64-windows - vcpkgArguments: qt5 ffmpeg openexr openimageio opencolorio portaudio + vcpkgArguments: qt5 ffmpeg openexr openimageio portaudio #opencolorio + + # We require the Unicode fix which hasn't been merged into upstream yet + - name: Acquire OpenColorIO + shell: bash + working-directory: ${{ runner.workspace }} + run: | + git clone https://github.com/olive-editor/OpenColorIO + cd OpenColorIO + git checkout win32-unicode-fix-for-olive-ci + mkdir build + cd build + cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ + -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ + -DCMAKE_INSTALL_PREFIX="$(pwd)/install" + ninja install - name: Acquire Google Crashpad shell: bash @@ -198,7 +213,7 @@ jobs: DEP_LOCATION: ${{ runner.workspace }}/install working-directory: ${{ runner.workspace }}/build run: | - PATH=$DEP_LOCATION:$DEP_LOCATION/crashpad:$PATH \ + PATH=$DEP_LOCATION:$DEP_LOCATION/crashpad:$GITHUB_WORKSPACE/OpenColorIO/build/install:$PATH \ cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" From f787cac170f90991db5166bc37c200c08fa4a2c9 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 18:36:55 -0700 Subject: [PATCH 19/30] irony --- .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 b6a1e0132..0a204eb42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,13 +173,14 @@ jobs: with: vcpkgGitCommitId: 2a31089e777fc187f1cc05338250b8e1810cfb52 vcpkgTriplet: x64-windows - vcpkgArguments: qt5 ffmpeg openexr openimageio portaudio #opencolorio + vcpkgArguments: qt5 ffmpeg openexr openimageio opencolorio portaudio # We require the Unicode fix which hasn't been merged into upstream yet - name: Acquire OpenColorIO shell: bash working-directory: ${{ runner.workspace }} run: | + $VCPKG_ROOT/vcpkg remove opencolorio git clone https://github.com/olive-editor/OpenColorIO cd OpenColorIO git checkout win32-unicode-fix-for-olive-ci From 719b74053d5038830abeddac49e27ed110d7a529 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 19:10:48 -0700 Subject: [PATCH 20/30] ensure x64 --- .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 0a204eb42..1ab421fc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: shell: bash working-directory: ${{ runner.workspace }} run: | - $VCPKG_ROOT/vcpkg remove opencolorio + $VCPKG_ROOT/vcpkg remove opencolorio:x64-windows git clone https://github.com/olive-editor/OpenColorIO cd OpenColorIO git checkout win32-unicode-fix-for-olive-ci From d3dd29a976c5c50290532f59ab08d9729a2882b3 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 19:24:22 -0700 Subject: [PATCH 21/30] Update ci.yml --- .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 1ab421fc7..2bce4b2d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -183,7 +183,7 @@ jobs: $VCPKG_ROOT/vcpkg remove opencolorio:x64-windows git clone https://github.com/olive-editor/OpenColorIO cd OpenColorIO - git checkout win32-unicode-fix-for-olive-ci + git checkout win32-unicode-fix mkdir build cd build cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ From 599a86d1ac4f85d76760ea235c471a891e555b70 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 20:44:50 -0700 Subject: [PATCH 22/30] Update ci.yml --- .github/workflows/ci.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bce4b2d8..55c4e43e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -190,6 +190,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_INSTALL_PREFIX="$(pwd)/install" ninja install + echo "$(pwd)/install" >> $GITHUB_PATH - name: Acquire Google Crashpad shell: bash @@ -197,6 +198,8 @@ jobs: run: | $DOWNLOAD_TOOL https://github.com/olive-editor/crashpad/releases/download/continuous/crashpad-win32-RelWithDebInfo.tar.gz tar xzf crashpad-win32-RelWithDebInfo.tar.gz + echo "$GITHUB_WORKSPACE/install" >> $GITHUB_PATH + echo "$GITHUB_WORKSPACE/install/crashpad" >> $GITHUB_PATH - name: Generate Patreon List shell: bash @@ -210,12 +213,9 @@ jobs: - name: Configure CMake shell: bash - env: - DEP_LOCATION: ${{ runner.workspace }}/install working-directory: ${{ runner.workspace }}/build run: | - PATH=$DEP_LOCATION:$DEP_LOCATION/crashpad:$GITHUB_WORKSPACE/OpenColorIO/build/install:$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 }}" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" - name: Build @@ -227,16 +227,12 @@ jobs: - name: Test working-directory: ${{ runner.workspace }}/build shell: bash - env: - DEP_LOCATION: ${{ runner.workspace }}/install run: | - PATH=$PATH:$DEP_LOCATION/bin ctest -C ${{ matrix.build-type }} -V + ctest -C ${{ matrix.build-type }} -V - name: Create Package working-directory: ${{ runner.workspace }}/build shell: bash - env: - DEP_LOCATION: ${{ runner.workspace }}/install run: | mkdir olive-editor cp app/olive-editor.exe olive-editor @@ -245,9 +241,9 @@ jobs: $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor - cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor - cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor - cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor + cp $(cygpath $GITHUB_WORKSPACE)/install/bin/*.dll olive-editor + cp $(cygpath $GITHUB_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor + cp $(cygpath $GITHUB_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor - name: Export Crashpad symbols working-directory: ${{ runner.workspace }}/build @@ -360,7 +356,7 @@ jobs: run: | brew install ninja PATH=/opt/olive-editor/bin:/opt/olive-editor/crashpad:$PATH \ - cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" -DCMAKE_INSTALL_PREFIX=$DEP_LOCATION + cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" - name: Build working-directory: ${{ runner.workspace }}/build From 720e627a01c934ddd9d6c1e228e72b9ce8b99402 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 22:12:12 -0700 Subject: [PATCH 23/30] try pwd -W --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55c4e43e1..0d2c3383c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -188,9 +188,9 @@ jobs: cd build cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ - -DCMAKE_INSTALL_PREFIX="$(pwd)/install" + -DCMAKE_INSTALL_PREFIX="$(pwd -W)/install" ninja install - echo "$(pwd)/install" >> $GITHUB_PATH + echo "$(pwd -W)/install" >> $GITHUB_PATH - name: Acquire Google Crashpad shell: bash From f53e2425ad3507baaf9f61d983a100916379acae Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 23:04:48 -0700 Subject: [PATCH 24/30] add ocio bin to the path --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d2c3383c..fd331d45f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -191,6 +191,7 @@ jobs: -DCMAKE_INSTALL_PREFIX="$(pwd -W)/install" ninja install echo "$(pwd -W)/install" >> $GITHUB_PATH + echo "$(pwd -W)/install/bin" >> $GITHUB_PATH - name: Acquire Google Crashpad shell: bash From d3b53e7612a094b2f4f25a8ee90cc1724e67043a Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 23:08:58 -0700 Subject: [PATCH 25/30] copy ocio dlls --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd331d45f..e0e9ca2e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -242,6 +242,7 @@ jobs: $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor + cp $(cygpath $GITHUB_WORKSPACE)/OpenColorIO/build/install/bin/*.dll olive-editor cp $(cygpath $GITHUB_WORKSPACE)/install/bin/*.dll olive-editor cp $(cygpath $GITHUB_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $GITHUB_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor From 669a78ec8fcc178b6ddbe06441fd9418ee0d9f67 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sun, 3 Oct 2021 23:55:06 -0700 Subject: [PATCH 26/30] build otio too --- .github/workflows/ci.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0e9ca2e9..cb193eadc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -186,21 +186,38 @@ jobs: git checkout win32-unicode-fix mkdir build cd build - cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ + cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_INSTALL_PREFIX="$(pwd -W)/install" ninja install echo "$(pwd -W)/install" >> $GITHUB_PATH echo "$(pwd -W)/install/bin" >> $GITHUB_PATH + # Should write a package script for this some day + - name: Acquire OpenTimelineIO + shell: bash + working-directory: ${{ runner.workspace }} + run: | + git clone --depth 1 --branch v0.13 https://github.com/PixarAnimationStudios/OpenTimelineIO.git + cd OpenTimelineIO + mkdir build + cd build + cmake .. -DOTIO_PYTHON_INSTALL=OFF -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ + -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ + -DCMAKE_INSTALL_PREFIX="$(pwd -W)/install" + ninja install + echo "$(pwd -W)/install" >> $GITHUB_PATH + echo "$(pwd -W)/install/bin" >> $GITHUB_PATH + - name: Acquire Google Crashpad shell: bash working-directory: ${{ runner.workspace }} run: | $DOWNLOAD_TOOL https://github.com/olive-editor/crashpad/releases/download/continuous/crashpad-win32-RelWithDebInfo.tar.gz tar xzf crashpad-win32-RelWithDebInfo.tar.gz - echo "$GITHUB_WORKSPACE/install" >> $GITHUB_PATH - echo "$GITHUB_WORKSPACE/install/crashpad" >> $GITHUB_PATH + echo "$(pwd -W)/install" >> $GITHUB_PATH + echo "$(pwd -W)/install/bin" >> $GITHUB_PATH + echo "$(pwd -W)/install/crashpad" >> $GITHUB_PATH - name: Generate Patreon List shell: bash @@ -243,6 +260,7 @@ jobs: $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor cp $(cygpath $GITHUB_WORKSPACE)/OpenColorIO/build/install/bin/*.dll olive-editor + cp $(cygpath $GITHUB_WORKSPACE)/OpenTimelineIO/build/install/bin/*.dll olive-editor cp $(cygpath $GITHUB_WORKSPACE)/install/bin/*.dll olive-editor cp $(cygpath $GITHUB_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $GITHUB_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor From 2011a08c444362dd8ff50f2b687e51aa5a652e84 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 4 Oct 2021 00:21:26 -0700 Subject: [PATCH 27/30] Update ci.yml --- .github/workflows/ci.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb193eadc..7e8f0f9f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,22 +192,24 @@ jobs: ninja install echo "$(pwd -W)/install" >> $GITHUB_PATH echo "$(pwd -W)/install/bin" >> $GITHUB_PATH + dir $(pwd -W)/install/bin # Should write a package script for this some day - name: Acquire OpenTimelineIO shell: bash working-directory: ${{ runner.workspace }} run: | - git clone --depth 1 --branch v0.13 https://github.com/PixarAnimationStudios/OpenTimelineIO.git + git clone --depth 1 https://github.com/PixarAnimationStudios/OpenTimelineIO.git cd OpenTimelineIO mkdir build cd build cmake .. -DOTIO_PYTHON_INSTALL=OFF -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" \ -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_INSTALL_PREFIX="$(pwd -W)/install" - ninja install - echo "$(pwd -W)/install" >> $GITHUB_PATH - echo "$(pwd -W)/install/bin" >> $GITHUB_PATH + ninja install + echo "$(pwd -W)/install" >> $GITHUB_PATH + echo "$(pwd -W)/install/bin" >> $GITHUB_PATH + dir $(pwd -W)/install/bin - name: Acquire Google Crashpad shell: bash @@ -251,6 +253,8 @@ jobs: - name: Create Package working-directory: ${{ runner.workspace }}/build shell: bash + env: + ORIGINAL_WORKSPACE: ${{ runner.workspace }} run: | mkdir olive-editor cp app/olive-editor.exe olive-editor @@ -259,11 +263,11 @@ jobs: $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-crashhandler.exe $VCPKG_ROOT/installed/x64-windows/tools/qt5/bin/windeployqt --no-angle olive-editor/olive-editor.exe cp $(cygpath $VCPKG_ROOT)/installed/x64-windows/bin/*.dll olive-editor - cp $(cygpath $GITHUB_WORKSPACE)/OpenColorIO/build/install/bin/*.dll olive-editor - cp $(cygpath $GITHUB_WORKSPACE)/OpenTimelineIO/build/install/bin/*.dll olive-editor - cp $(cygpath $GITHUB_WORKSPACE)/install/bin/*.dll olive-editor - cp $(cygpath $GITHUB_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor - cp $(cygpath $GITHUB_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor + cp $(cygpath $ORIGINAL_WORKSPACE)/OpenColorIO/build/install/bin/*.dll olive-editor + cp $(cygpath $ORIGINAL_WORKSPACE)/OpenTimelineIO/build/install/bin/*.dll olive-editor + cp $(cygpath $ORIGINAL_WORKSPACE)/install/bin/*.dll olive-editor + cp $(cygpath $ORIGINAL_WORKSPACE)/install/crashpad/out/Default/crashpad_handler.exe olive-editor + cp $(cygpath $ORIGINAL_WORKSPACE)/install/bin/minidump_stackwalk.exe olive-editor - name: Export Crashpad symbols working-directory: ${{ runner.workspace }}/build From 88a27636326f06a8822475a4857a60a8956aba24 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 4 Oct 2021 00:43:17 -0700 Subject: [PATCH 28/30] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e8f0f9f0..10ac14ba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -207,6 +207,8 @@ jobs: -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \ -DCMAKE_INSTALL_PREFIX="$(pwd -W)/install" ninja install + mkdir -p install/bin + mv install/lib/*.dll install/bin echo "$(pwd -W)/install" >> $GITHUB_PATH echo "$(pwd -W)/install/bin" >> $GITHUB_PATH dir $(pwd -W)/install/bin From d630b032992a1901be35b9ed95ed8b75cf713baf Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 4 Oct 2021 15:58:13 -0700 Subject: [PATCH 29/30] print path --- .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 10ac14ba3..5ebdd34ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -250,7 +250,8 @@ jobs: working-directory: ${{ runner.workspace }}/build shell: bash run: | - ctest -C ${{ matrix.build-type }} -V + #ctest -C ${{ matrix.build-type }} -V + echo Path is: $PATH - name: Create Package working-directory: ${{ runner.workspace }}/build From 01b5441dec4e73e0bc9449c40d3a4216af445b89 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 5 Oct 2021 01:51:01 -0700 Subject: [PATCH 30/30] test path for windows --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ebdd34ff..d5810d194 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -250,8 +250,7 @@ jobs: working-directory: ${{ runner.workspace }}/build shell: bash run: | - #ctest -C ${{ matrix.build-type }} -V - echo Path is: $PATH + PATH=$PATH:$VCPKG_ROOT/installed/x64-windows/bin ctest -C ${{ matrix.build-type }} -V - name: Create Package working-directory: ${{ runner.workspace }}/build