Skip to content

Commit

Permalink
GHA: testing
Browse files Browse the repository at this point in the history
  • Loading branch information
petersteneteg authored Nov 7, 2024
1 parent edd1287 commit 0bbe345
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 32 deletions.
29 changes: 17 additions & 12 deletions .github/presets/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,25 @@
"cmakeMinimumRequired": { "major": 3, "minor": 23, "patch": 0 },
"configurePresets": [
{
"name": "gha-modules",
"name": "common",
"displayName": "Modules GHA",
"inherits" : ["modules", "modules-vcpkg"],
"cacheVariables": {
"IVW_MODULE_OPENMESH": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_SPRINGSYSTEM": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_VASP": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_NANOVGUTILS": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_TENSORVISBASE": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_INTEGRALLINEFILTERING": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_MOLVISBASE": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_MOLVISGL": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_MOLVISPYTHON": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_DATAFRAMECLUSTERING": { "type": "BOOL", "value": "ON"}
"IVW_MODULE_EIGENUTILS": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_HDF5": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_FFMPEG": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_WEBBROWSER": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_TETRAMESH": { "type": "BOOL", "value": "ON"},

"IVW_MODULE_OPENMESH": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_SPRINGSYSTEM": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_VASP": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_NANOVGUTILS": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_TENSORVISBASE": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_INTEGRALLINEFILTERING": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_MOLVISBASE": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_MOLVISGL": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_MOLVISPYTHON": { "type": "BOOL", "value": "ON"},
"IVW_MODULE_DATAFRAMECLUSTERING": { "type": "BOOL", "value": "ON"}
}
}
]
Expand Down
34 changes: 28 additions & 6 deletions .github/presets/linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,39 @@
"version": 9,
"cmakeMinimumRequired": { "major": 3, "minor": 30, "patch": 0 },
"include" : [
"${sourceParentDir}/modules/.github/presets/common.json",
"${sourceDir}/.github/presets/linux.json"
"${sourceParentDir}/modules/.github/presets/common.json"
],
"configurePresets": [
{
"name": "gha-modules-static",
"inherits" : ["gha-modules", "gha-static"]
"name": "gha",
"displayName": "Ninja Developer configuration",
"inherits" : ["common", "modules", "modules-vcpkg", "ninja", "developer", "vcpkg", "vcpkg-cache-write", "build"],
"cacheVariables": {
"CMAKE_C_COMPILER_LAUNCHER": "ccache",
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",

"IVW_MODULE_FFMPEG": "OFF",
"IVW_MODULE_WEBBROWSER": "OFF",
"IVW_TEST_BENCHMARKS": "OFF"
}
},
{
"name": "gha-modules-dynamic",
"inherits" : ["gha-modules", "gha-dynamic"]
"name": "gha-static",
"inherits" : ["gha"],
"cacheVariables": {
"BUILD_SHARED_LIBS": { "type": "BOOL", "value": "OFF"},
"VCPKG_TARGET_TRIPLET": "x64-linux",
"VCPKG_HOST_TRIPLET": "x64-linux"
}
},
{
"name": "gha-dynamic",
"inherits" : ["gha"],
"cacheVariables": {
"BUILD_SHARED_LIBS": { "type": "BOOL", "value": "ON"},
"VCPKG_TARGET_TRIPLET": "x64-linux-dynamic",
"VCPKG_HOST_TRIPLET": "x64-linux-dynamic"
}
}
]
}
24 changes: 18 additions & 6 deletions .github/presets/macos.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,29 @@
"version": 9,
"cmakeMinimumRequired": { "major": 3, "minor": 30, "patch": 0 },
"include" : [
"${sourceParentDir}/modules/.github/presets/common.json",
"${sourceDir}/.github/presets/macos.json"
"${sourceParentDir}/modules/.github/presets/common.json"
],
"configurePresets": [
{
"name": "gha-modules-static",
"inherits" : ["gha-modules", "gha-static"]
"name": "gha",
"displayName": "Xcode Developer configuration",
"inherits" : ["common", "modules", "modules-vcpkg", "xcode", "developer", "vcpkg", "vcpkg-cache-write", "build"],
"cacheVariables": {
"IVW_CFG_USE_CCACHE_XCODE": "ON"
}
},
{
"name": "gha-modules-dynamic",
"inherits" : ["gha-modules", "gha-dynamic"]
"name": "gha-static",
"inherits" : ["gha"],
"cacheVariables": {
"BUILD_SHARED_LIBS": { "type": "BOOL", "value": "OFF"},
"VCPKG_TARGET_TRIPLET": "arm64-osx",
"VCPKG_HOST_TRIPLET": "arm64-osx"
}
},
{
"name": "gha-dynamic",
"inherits" : ["gha"]
}
]
}
31 changes: 25 additions & 6 deletions .github/presets/windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,36 @@
"version": 9,
"cmakeMinimumRequired": { "major": 3, "minor": 30, "patch": 0 },
"include" : [
"${sourceParentDir}/modules/.github/presets/common.json",
"${sourceDir}/.github/presets/windows.json"
"${sourceParentDir}/modules/.github/presets/common.json"
],
"configurePresets": [
{
"name": "gha-modules-static",
"inherits" : ["gha-modules", "gha-static"]
"name": "gha",
"inherits" : ["common", "modules", "modules-vcpkg", "msvc", "developer", "vcpkg", "vcpkg-cache-write", "build"],
"cacheVariables": {
"IVW_CFG_USE_CCACHE_MSVC": "ON",
"IVW_MODULE_SGCT": "ON",
"IVW_APP_INVIWO_DOME": "ON",
"VCPKG_MANIFEST_FEATURES": "sgct"
}
},
{
"name": "gha-modules-dynamic",
"inherits" : ["gha-modules", "gha-dynamic"]
"name": "gha-static",
"inherits" : ["gha"],
"cacheVariables": {
"IVW_CFG_MSVC_FORCE_SHARED_CRT": { "type": "BOOL", "value": "ON"},
"BUILD_SHARED_LIBS": { "type": "BOOL", "value": "OFF"},
"VCPKG_TARGET_TRIPLET": "x64-windows-static-md",
"VCPKG_HOST_TRIPLET": "x64-windows-static-md"
}
},
{
"name": "gha-dynamic",
"inherits" : ["gha"],
"cacheVariables": {
"IVW_DOXYGEN_PROJECT": "ON",
"IVW_DOXYGEN_LATEX_PATH": "C:/tools/TinyTeX/bin/win32/pdflatex.exe"
}
}
]
}
4 changes: 2 additions & 2 deletions .github/workflows/modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
- name: "Configure CMake"
shell: bash
run: >
cmake -S inviwo -B build --preset gha-modules-${{ matrix.linkage }}
cmake -S inviwo -B build --preset gha-${{ matrix.linkage }}
-DCMAKE_BUILD_TYPE=${{ matrix.configuration }}
-DVCPKG_INSTALL_OPTIONS='--clean-after-build'
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
- name: "Configure CMake"
shell: bash
run: >
cmake -S inviwo -B build --preset gha-modules-dynamic
cmake -S inviwo -B build --preset gha-dynamic
-DCMAKE_CXX_FLAGS='-stdlib=libc++'
-DVCPKG_INSTALL_OPTIONS='--clean-after-build'
-DCMAKE_BUILD_TYPE=Release
Expand Down

0 comments on commit 0bbe345

Please sign in to comment.