From 0a42822d40a7d166f5f984c6be5267e30b0dede3 Mon Sep 17 00:00:00 2001 From: Peter Steneteg Date: Wed, 4 Dec 2024 20:38:35 +0100 Subject: [PATCH 1/3] GHA: preset fix --- .github/presets/common.json | 3 ++- .github/workflows/modules.yml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/presets/common.json b/.github/presets/common.json index 68101f2e..74e55834 100644 --- 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 index 7df25791..32b750de 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -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 From 23cf4f1b097ce80010ee02fca80b1017c5db0b15 Mon Sep 17 00:00:00 2001 From: Peter Steneteg Date: Wed, 4 Dec 2024 22:04:38 +0100 Subject: [PATCH 2/3] GHA: fix --- .github/presets/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/presets/common.json b/.github/presets/common.json index 74e55834..9539f0dc 100644 --- a/.github/presets/common.json +++ b/.github/presets/common.json @@ -7,7 +7,7 @@ "displayName": "Modules GHA", "cacheVariables": { "VCPKG_MANIFEST_FEATURES" : "graphviz;openmesh;nanovg", - "VCPKG_INSTALL_OPTIONS": "--clean-after-build --x-abi-tools-use-exact-versions", + "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"}, From f24705299f75c696c4624d7d66fa75048df081c0 Mon Sep 17 00:00:00 2001 From: Peter Steneteg Date: Wed, 4 Dec 2024 22:06:49 +0100 Subject: [PATCH 3/3] GHA: no more submodules --- .github/workflows/modules.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index 32b750de..2d160375 100644 --- 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 @@ -223,7 +223,7 @@ jobs: uses: actions/checkout@v4 with: path: modules - submodules: true + submodules: false - name: "Clone Inviwo" uses: actions/checkout@v4 @@ -321,7 +321,7 @@ jobs: uses: actions/checkout@v4 with: path: modules - submodules: true + submodules: false - name: "Clone Inviwo" uses: actions/checkout@v4