From 2ef338f0c0952e25cfb073073a90fe17c9601766 Mon Sep 17 00:00:00 2001 From: William Rankin Date: Mon, 14 Sep 2020 17:03:39 +1000 Subject: [PATCH 01/20] Prefer curl on OSX wget is not available by default on OSX --- .travis/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/script.sh b/.travis/script.sh index b4cb03e76..a7fefdccb 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -26,7 +26,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then macdeployqt $BUNDLE_NAME # Fix other deps that macdeployqt missed - wget -c -nv https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py + curl -sLOC - https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/ # Fix deps on crash handler From 030fceba35ebf17c4ee4af2c8592cb4f4df26e95 Mon Sep 17 00:00:00 2001 From: William Rankin Date: Mon, 14 Sep 2020 19:43:23 +1000 Subject: [PATCH 02/20] Update .travis/script.sh Co-authored-by: Simran --- .travis/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/script.sh b/.travis/script.sh index a7fefdccb..4a7a7fa2c 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -26,7 +26,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then macdeployqt $BUNDLE_NAME # Fix other deps that macdeployqt missed - curl -sLOC - https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py + 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.*/ # Fix deps on crash handler From 4b20d11f76d64d77586ba66d49623ff18fd1b6b8 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 20:44:46 +1000 Subject: [PATCH 03/20] Create ci.yml ci: beginning of GitHub Actions CI --- .github/workflows/ci.yml | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..608f8549b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,49 @@ +name: CMake + +on: + push: + branches: + - master + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: RelWithDebInfo + +jobs: + build: + # The CMake configure and build commands are platform agnostic and should work equally + # well on Windows or Mac. You can convert this to a matrix build if you need + # 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 + + steps: + - 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: 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: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + + - name: Build + working-directory: ${{runner.workspace}}/build + shell: bash + # Execute the build. You can specify a specific target with "--target " + run: cmake --build . --config $BUILD_TYPE + + - 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 $BUILD_TYPE From 570604a1a5481c3cffdef5bbae27f8af3b2cc460 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 20:55:13 +1000 Subject: [PATCH 04/20] Update ci.yml ci: test dependency acquisition --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 608f8549b..be6b7ddd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,10 @@ jobs: # 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: Acquire FFmpeg: + # Acquires FFmpeg 4.2.3 from remote server + run: wget -c http://olivevideoeditor.org/deps/ffmpeg-win.7z - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable From 026e9bc2ffaf5232e4ff8247e5f06ad57f597d61 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 20:57:16 +1000 Subject: [PATCH 05/20] ci: remove extraneous colon --- .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 be6b7ddd7..e139be906 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: # We'll use this as our working directory for all subsequent commands run: cmake -E make_directory ${{runner.workspace}}/build - - name: Acquire FFmpeg: + - name: Acquire FFmpeg # Acquires FFmpeg 4.2.3 from remote server run: wget -c http://olivevideoeditor.org/deps/ffmpeg-win.7z From d1a01cbaa258a5bd331cab1c3dfaad8a9eeb5e86 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 21:25:25 +1000 Subject: [PATCH 06/20] ci: try using curl in actions --- .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 e139be906..6938fdcef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Acquire FFmpeg # Acquires FFmpeg 4.2.3 from remote server - run: wget -c http://olivevideoeditor.org/deps/ffmpeg-win.7z + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable From 6ca379640838f39a6dc2d83e1070c5c92a84699f Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 21:38:35 +1000 Subject: [PATCH 07/20] ci: acquire all dependencies --- .github/workflows/ci.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6938fdcef..c692bdcb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,8 +26,28 @@ jobs: run: cmake -E make_directory ${{runner.workspace}}/build - name: Acquire FFmpeg - # Acquires FFmpeg 4.2.3 from remote server - run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z && 7z x ffmpeg-win.7z + + - name: Acquire OpenColorIO + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ocio-win.7z && 7z x ocio-win.7z + + - name: Acquire OpenEXR + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/openexr-win.7z && 7z x openexr-win.7z + + - name: Acquire OpenImageIO + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/oiio-win.7z && 7z x oiio-win.7z + + - name: Acquire libpng + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libpng-win.7z && 7z x libpng-win.7z + + - name: Acquire libtiff + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libtiff-win.7z && 7z x libtiff-win.7z + + - name: Acquire turbojpeg + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z + + - name: Acquire zlib + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable From 9a2292b024fda6e978116e12729c13f38558e025 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 22:43:27 +1000 Subject: [PATCH 08/20] ci: try using ninja --- .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 c692bdcb8..f932886a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,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: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G Ninja - name: Build working-directory: ${{runner.workspace}}/build From a3ee126cf2c6c54e9abd12fd0525e81848fbcbce Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 22:44:58 +1000 Subject: [PATCH 09/20] ci: use nmake --- .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 f932886a8..e97dfaaee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,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: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G Ninja + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "NMake Makefiles" - name: Build working-directory: ${{runner.workspace}}/build From 10a4f07a408b37149bf64a80d4ce3e25b9ee91bf Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 22:48:58 +1000 Subject: [PATCH 10/20] ci: try enabling msvc developer prompt and ninja --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e97dfaaee..3c1364e10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,9 @@ jobs: # 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 + - name: Acquire FFmpeg run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z && 7z x ffmpeg-win.7z @@ -57,7 +60,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: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "NMake Makefiles" + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" - name: Build working-directory: ${{runner.workspace}}/build From a26deb10fb829292db9c4d179559b5ab271cf93b Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 23:02:28 +1000 Subject: [PATCH 11/20] ci: acquire Qt --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c1364e10..0d6bc4db8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,11 @@ jobs: - name: Enable Developer Command Prompt uses: ilammy/msvc-dev-cmd@v1.3.0 + - name: Acquire Qt + uses: jurplel/install-qt-action@v2.8.0 + with: + version: 5.15.1 + - name: Acquire FFmpeg run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z && 7z x ffmpeg-win.7z From db4e4944a84610282a0b64a859d86d9e1b1e0a78 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 23:13:35 +1000 Subject: [PATCH 12/20] ci: try acquiring all dependencies into build folder --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d6bc4db8..6677019bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,27 +34,35 @@ jobs: version: 5.15.1 - name: Acquire FFmpeg + working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z && 7z x ffmpeg-win.7z - name: Acquire OpenColorIO + working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ocio-win.7z && 7z x ocio-win.7z - name: Acquire OpenEXR + working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/openexr-win.7z && 7z x openexr-win.7z - name: Acquire OpenImageIO + working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/oiio-win.7z && 7z x oiio-win.7z - name: Acquire libpng + working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libpng-win.7z && 7z x libpng-win.7z - name: Acquire libtiff + working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libtiff-win.7z && 7z x libtiff-win.7z - name: Acquire turbojpeg + working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z - name: Acquire zlib + working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z - name: Configure CMake From b1c3b0e4511bd39c038f0e8d1a3ad671e12099a3 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 14 Sep 2020 23:18:22 +1000 Subject: [PATCH 13/20] ci: build dependencies in main directory again --- .github/workflows/ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6677019bd..ebf007985 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,31 +34,24 @@ jobs: version: 5.15.1 - name: Acquire FFmpeg - working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ffmpeg-win.7z && 7z x ffmpeg-win.7z - name: Acquire OpenColorIO - working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/ocio-win.7z && 7z x ocio-win.7z - name: Acquire OpenEXR - working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/openexr-win.7z && 7z x openexr-win.7z - name: Acquire OpenImageIO - working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/oiio-win.7z && 7z x oiio-win.7z - name: Acquire libpng - working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libpng-win.7z && 7z x libpng-win.7z - name: Acquire libtiff - working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/libtiff-win.7z && 7z x libtiff-win.7z - name: Acquire turbojpeg - working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z - name: Acquire zlib @@ -73,7 +66,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: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" --debug-output - name: Build working-directory: ${{runner.workspace}}/build From 9ddcd2a229f8dafce6b8603b041656a2184f3226 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 02:14:31 +1000 Subject: [PATCH 14/20] ci: maybe this new zlib build will work --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebf007985..4f1b6500e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,6 @@ jobs: run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z - name: Acquire zlib - working-directory: ${{runner.workspace}}/build run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z - name: Configure CMake From 8792c66c9cb80f9d1cb38005fd2f2d91256379fa Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 02:32:44 +1000 Subject: [PATCH 15/20] ci: removed debug output flag --- .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 4f1b6500e..0d6bc4db8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,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: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" --debug-output + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" - name: Build working-directory: ${{runner.workspace}}/build From 16a69e26663142f60f994f07f2f4005f4027d766 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 02:43:35 +1000 Subject: [PATCH 16/20] ci: hacky path set --- .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 0d6bc4db8..e82c9384a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z - name: Acquire zlib - run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z && set PATH=%cd%;%PATH% - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable From 3019924e81c06c009bd1b761854a2658d5ae6914 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 02:47:13 +1000 Subject: [PATCH 17/20] ci: use cmd for hacky path hack --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e82c9384a..92448bd01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,6 +56,7 @@ jobs: - name: Acquire zlib run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z && set PATH=%cd%;%PATH% + shell: cmd - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable From 18979abe082c79ccd9151427495073c6915ee80d Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 02:50:21 +1000 Subject: [PATCH 18/20] ci: different attempt at hacky path hack --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92448bd01..f2fc293d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,8 +55,7 @@ jobs: run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z - name: Acquire zlib - run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z && set PATH=%cd%;%PATH% - shell: cmd + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable @@ -66,7 +65,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: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" + run: PATH=$PATH:${{runner.workspace}} cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" - name: Build working-directory: ${{runner.workspace}}/build From 589099d67e8768a5ca7fd830f57af55b905fd24e Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 02:54:30 +1000 Subject: [PATCH 19/20] ci: i don't even know what i'm doing anymore --- .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 f2fc293d1..4f1ac080e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z - name: Acquire zlib - run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z && set ZLIB_ROOT=%cd% - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable From 66cfe9b34c467d8efdfa2da74e1dc73105e6703f Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 02:59:25 +1000 Subject: [PATCH 20/20] ci: pfpfhpfbbfht --- .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 4f1ac080e..e03a583da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/turbojpeg-win.7z && 7z x turbojpeg-win.7z - name: Acquire zlib - run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z && set ZLIB_ROOT=%cd% + run: curl -fLOSs --retry 3 http://olivevideoeditor.org/deps/zlib-win.7z && 7z x zlib-win.7z - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable @@ -65,7 +65,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=$PATH:${{runner.workspace}} cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" + run: export ZLIB_ROOT=$GITHUB_WORKSPACE && cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" - name: Build working-directory: ${{runner.workspace}}/build