Skip to content

Commit

Permalink
Create binary artifacts for Linux
Browse files Browse the repository at this point in the history
* Bundle Qt binaries and create artifacts on Linux 
* Add qt.conf for Linux
* Remove install target for unit test
  • Loading branch information
magnesj authored Feb 13, 2024
1 parent 7c317cf commit 8fe385a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ResInsightWithCache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions ApplicationExeCode/CMakeLists.txt
Original file line number Diff 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
2 changes: 2 additions & 0 deletions ApplicationExeCode/qt.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Paths]
Plugins = plugins
2 changes: 0 additions & 2 deletions ApplicationLibCode/UnitTests/CMakeLists.txt
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})

0 comments on commit 8fe385a

Please sign in to comment.