From 8fe385adcfcb4f0ef002e9d0d90ac075768932cb Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 13 Feb 2024 09:06:38 +0100 Subject: [PATCH] Create binary artifacts for Linux * Bundle Qt binaries and create artifacts on Linux * Add qt.conf for Linux * Remove install target for unit test --- .github/workflows/ResInsightWithCache.yml | 4 ++-- .github/workflows/delete_artifacts.py | 2 +- ApplicationExeCode/CMakeLists.txt | 2 ++ ApplicationExeCode/qt.conf | 2 ++ ApplicationLibCode/UnitTests/CMakeLists.txt | 2 -- 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 ApplicationExeCode/qt.conf diff --git a/.github/workflows/ResInsightWithCache.yml b/.github/workflows/ResInsightWithCache.yml index 44e10f3014..1d45d0c2bb 100644 --- a/.github/workflows/ResInsightWithCache.yml +++ b/.github/workflows/ResInsightWithCache.yml @@ -210,6 +210,7 @@ jobs: -D CMAKE_BUILD_TYPE=$ENV{BUILD_TYPE} -D CMAKE_INSTALL_PREFIX=cmakebuild/install -D RESINSIGHT_BUNDLE_OPENSSL=true + -D RESINSIGHT_QT5_BUNDLE_LIBRARIES=true -D RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS=true -D RESINSIGHT_TREAT_WARNINGS_AS_ERRORS=true -D RESINSIGHT_ENABLE_PRECOMPILED_HEADERS=false @@ -272,8 +273,7 @@ jobs: name: python-distribution path: GrpcInterface/Python/dist - - name: Upload Windows install artifact - if: contains( matrix.config.os, 'windows') + - name: Upload artifacts uses: actions/upload-artifact@v4 with: name: ResInsight-${{ matrix.config.name }} diff --git a/.github/workflows/delete_artifacts.py b/.github/workflows/delete_artifacts.py index 6d19130d68..169c6ae4b3 100644 --- a/.github/workflows/delete_artifacts.py +++ b/.github/workflows/delete_artifacts.py @@ -6,7 +6,7 @@ org_name = "OPM" repo_name = "ResInsight" -keep_artifacts = 20 +keep_artifacts = 100 def get_all_artifacts(repo_name: str, headers: dict) -> []: amount_items_per_page = 50 diff --git a/ApplicationExeCode/CMakeLists.txt b/ApplicationExeCode/CMakeLists.txt index a865e66a1a..e749eca703 100644 --- a/ApplicationExeCode/CMakeLists.txt +++ b/ApplicationExeCode/CMakeLists.txt @@ -484,6 +484,8 @@ if(RESINSIGHT_PRIVATE_INSTALL) OPTIONAL ) + install(FILES qt.conf DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/) + endif(RESINSIGHT_QT5_BUNDLE_LIBRARIES) endif() diff --git a/ApplicationExeCode/qt.conf b/ApplicationExeCode/qt.conf new file mode 100644 index 0000000000..f747e09377 --- /dev/null +++ b/ApplicationExeCode/qt.conf @@ -0,0 +1,2 @@ +[Paths] +Plugins = plugins \ No newline at end of file diff --git a/ApplicationLibCode/UnitTests/CMakeLists.txt b/ApplicationLibCode/UnitTests/CMakeLists.txt index 3d6b5c8bfb..941bf2afbb 100644 --- a/ApplicationLibCode/UnitTests/CMakeLists.txt +++ b/ApplicationLibCode/UnitTests/CMakeLists.txt @@ -214,5 +214,3 @@ if(MSVC) endif(MSVC) add_test(NAME ResInsight-tests COMMAND ResInsight-tests) - -install(TARGETS ResInsight-tests DESTINATION ${RESINSIGHT_INSTALL_FOLDER})