Create binary artifacts for Linux

* Bundle Qt binaries and create artifacts on Linux * Add qt.conf for Linux * Remove install target for unit test
OPM · Feb 13, 2024 · 8fe385a · 8fe385a
1 parent 7c317cf
commit 8fe385a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+[Paths]
+Plugins = plugins
diff --git 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})
-Original file line number
+Diff line change
@@ Expand Up / @@ -484,6 +484,8 @@ if(RESINSIGHT_PRIVATE_INSTALL) @@
             OPTIONAL
           )
+          install(FILES qt.conf DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/)
         endif(RESINSIGHT_QT5_BUNDLE_LIBRARIES)
       endif()
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -214,5 +214,3 @@ if(MSVC)
		endif(MSVC)

		add_test(NAME ResInsight-tests COMMAND ResInsight-tests)

		install(TARGETS ResInsight-tests DESTINATION ${RESINSIGHT_INSTALL_FOLDER})