added debug build and artifacts

scharlton2 · Feb 10, 2022 · 0134443 · 0134443
1 parent 6f3cda3
commit 0134443
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,11 +27,8 @@ jobs:
       id: cache-vtk-6-3-0
       uses: actions/cache@v2
       with:
-        path: |
-          C:\VTK-6.3.0
-          C:\VTK-6.3.0-vs2017-x64
-          C:\VTK-6.3.0-vs2017-x64-Install
-        key: vtk-6.3.0-vs2017-x64   # @todo -${{hashFiles('./misc/CMakePresets.json')}}
+        path: C:\VTK-6.3.0-vs2017-x64
+        key: vtk-6.3.0-vs2017-x64-${{hashFiles('./misc/CMakePresets.json')}}
 
     - name: Download vtk-6.3.0
       if: steps.cache-vtk-6-3-0.outputs.cache-hit != 'true'
@@ -50,8 +47,25 @@ jobs:
         cp misc\CMakePresets.json C:\VTK-6.3.0\.
         cd C:\VTK-6.3.0
         cmake --preset vs2017
+        cmake --build --preset vs2017 --config debug
         cmake --build --preset vs2017 --config release
-        cmake --install C:/VTK-6.3.0-vs2017-x64 --prefix C:/VTK-6.3.0-vs2017-x64-Install --config release
+        cmake --install C:/VTK-6.3.0-vs2017-x64-build --prefix C:/VTK-6.3.0-vs2017-x64 --config debug
+        cmake --install C:/VTK-6.3.0-vs2017-x64-build --prefix C:/VTK-6.3.0-vs2017-x64 --config release
+        7z a ${{ github.workspace }}\vtk-6.3.0-vs2017-x64.7z C:\VTK-6.3.0-vs2017-x64
+
+    - name: upload-artifact 7z
+      if: steps.cache-vtk-6-3-0.outputs.cache-hit != 'true'
+      uses: actions/upload-artifact@v2
+      with:
+        name: vtk-6.3.0-vs2017-x64.7z
+        path: ${{ github.workspace }}/vtk-6.3.0-vs2017-x64.7z
+
+    - name: upload-artifact CMakeCache.txt
+      if: steps.cache-vtk-6-3-0.outputs.cache-hit != 'true'
+      uses: actions/upload-artifact@v2
+      with:
+        name: CMakeCache.txt
+        path: C:/VTK-6.3.0-vs2017-x64-build/CMakeCache.txt
 
   build:
     runs-on: windows-2019

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -30,6 +30,7 @@
       "name": "vs2019",
       "displayName": "vs2019 x64 with vtk-6.0.0-vs2010 (builds in _vs2019)",
       "generator": "Visual Studio 16 2019",
+      "architecture": "x64",
       "binaryDir": "${sourceDir}/_vs2019",
       "cacheVariables": {
         "VTK_DIR" : "C:/VTK6.0.0_build64"

diff --git a/misc/CMakePresets.json b/misc/CMakePresets.json
@@ -11,7 +11,7 @@
         "displayName": "vs2017 x64 with vtk-6.3.0-vs2017",
         "generator": "Visual Studio 15 2017",
         "architecture": "x64",
-        "binaryDir": "C:/VTK-6.3.0-vs2017-x64",
+        "binaryDir": "C:/VTK-6.3.0-vs2017-x64-build",
         "cacheVariables": {
           "BUILD_TESTING": {
             "type": "BOOL",
@@ -27,15 +27,16 @@
           "Notes": "This file should be placed in the root directory of C:/VTK-6.3.0",
           "Configure": "cmake --preset vs2017",
           "Build": "cmake --build --preset vs2017 --config release",
-          "Install": "cmake --install C:/VTK-6.3.0-vs2017-x64 --prefix <PREFIX> --config release"
+          "Install-debug": "cmake --install C:/VTK-6.3.0-vs2017-x64-build --prefix C:/VTK-6.3.0-vs2017-x64 --config debug",
+          "Install-release": "cmake --install C:/VTK-6.3.0-vs2017-x64-build --prefix C:/VTK-6.3.0-vs2017-x64 --config release"
         }
       },
       {
         "name": "vs2017-leaks",
         "displayName": "vs2017 x64 with vtk-6.3.0-vs2017 with VTK_DEBUG_LEAKS=ON",
         "generator": "Visual Studio 15 2017",
         "architecture": "x64",
-        "binaryDir": "C:/VTK-6.3.0-vs2017-x64-Leaks",
+        "binaryDir": "C:/VTK-6.3.0-leaks-vs2017-x64-build",
         "cacheVariables": {
           "BUILD_TESTING": {
             "type": "BOOL",
@@ -55,14 +56,19 @@
           "Notes": "This file should be placed in the root directory of C:/VTK-6.3.0",
           "Configure": "cmake --preset vs2017-leaks",
           "Build": "cmake --build --preset vs2017-leaks --config release",
-          "Install": "cmake --install C:/VTK-6.3.0-vs2017-x64-Leaks --prefix <PREFIX> --config release"
+          "Install-debug": "cmake --install C:/VTK-6.3.0-leaks-vs2017-x64-build --prefix C:/VTK-6.3.0-leaks-vs2017-x64 --config debug",
+          "Install-release": "cmake --install C:/VTK-6.3.0-leaks-vs2017-x64-build --prefix C:/VTK-6.3.0-leaks-vs2017-x64 --config release"
         }
       }
     ],
     "buildPresets": [
       {
         "name": "vs2017",
         "configurePreset": "vs2017"
+      },
+      {
+        "name": "vs2017-leaks",
+        "configurePreset": "vs2017-leaks"
       }
     ],
     "vendor": {