Merge pull request #244 from inviwo/feature/preset-fix

GHA: preset fix
inviwo · Dec 5, 2024 · 7759d39 · 7759d39
2 parents 0d4cd1e + f247052
commit 7759d39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/presets/common.json b/.github/presets/common.json
@@ -7,7 +7,8 @@
       "displayName": "Modules GHA",
       "cacheVariables": {
         "VCPKG_MANIFEST_FEATURES" : "graphviz;openmesh;nanovg",
-
+        "VCPKG_INSTALL_OPTIONS": "--clean-after-build;--x-abi-tools-use-exact-versions",
+
         "IVW_MODULE_EIGENUTILS":            { "type": "BOOL", "value": "ON"},
         "IVW_MODULE_HDF5":                  { "type": "BOOL", "value": "ON"},
         "IVW_MODULE_FFMPEG":                { "type": "BOOL", "value": "ON"},

diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml
@@ -124,7 +124,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: modules
-        submodules: true
+        submodules: false
 
     - name: "Clone Inviwo"
       uses: actions/checkout@v4
@@ -158,7 +158,6 @@ jobs:
       run: >
         cmake -S inviwo -B build --preset gha-${{ matrix.linkage }}
         -DCMAKE_BUILD_TYPE=${{ matrix.configuration }}
-        -DVCPKG_INSTALL_OPTIONS='--clean-after-build'
 
     - name: "Build"
       timeout-minutes: 360
@@ -224,7 +223,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: modules
-        submodules: true
+        submodules: false
 
     - name: "Clone Inviwo"
       uses: actions/checkout@v4
@@ -322,7 +321,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: modules
-        submodules: true
+        submodules: false
 
     - name: "Clone Inviwo"
       uses: actions/checkout@v4