From c0ad72da3698b517b7114a3f662f66c0fec5c8a9 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 03:12:54 +1000 Subject: [PATCH 1/3] ci: try to set lib path before configure --- .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 e03a583da..51bfa5644 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: export ZLIB_ROOT=$GITHUB_WORKSPACE && cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" + run: PATH=$GITHUB_WORKSPACE:$PATH cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Ninja" - name: Build working-directory: ${{runner.workspace}}/build From 916f170fa2194bd65f7396435a03ec3186a90471 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 03:31:09 +1000 Subject: [PATCH 2/3] ci: try packaging --- .github/workflows/ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51bfa5644..ccae161ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,3 +79,17 @@ jobs: # 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 + + - name: Create Package + working-directory: ${{runner.workspace}}/build + run: mkdir olive-editor && copy app\olive-editor.exe olive-editor && windeployqt olive-editor\olive-editor.exe && copy ..\bin\*.dll olive-editor + + - name: Deploy Portable + working-directory: ${{runner.workspace}}/build/olive-editor + run: copy nul olive-editor\portable && 7z a Olive-Windows-x86_64.zip olive-editor + + - name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: Olive-Windows-x86_64.zip + path: ${{runner.workspace}}/build/Olive-Windows-x86_64.zip From 9ec4dd3467c527284e7a786671a25ba1672780bb Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 15 Sep 2020 03:46:18 +1000 Subject: [PATCH 3/3] ci: try using env variable to find dlls --- .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 ccae161ef..b6d547191 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: - name: Create Package working-directory: ${{runner.workspace}}/build - run: mkdir olive-editor && copy app\olive-editor.exe olive-editor && windeployqt olive-editor\olive-editor.exe && copy ..\bin\*.dll olive-editor + run: mkdir olive-editor && copy app\olive-editor.exe olive-editor && windeployqt olive-editor\olive-editor.exe && copy %GITHUB_WORKSPACE%\bin\*.dll olive-editor - name: Deploy Portable working-directory: ${{runner.workspace}}/build/olive-editor