Improve CI labels (#783)

.github/actions/vtk-install-dep/action.yml

@@ -9,10 +9,10 @@ inputs:
     description: 'VTK SHA file'
     required: false
     default: ''
-  enable_raytracing:
-    description: 'Enable Raytracing'
+  raytracing_label:
+    description: 'Label to control raytracing'
     required: false
-    default: 'false'
+    default: 'no-raytracing'
 runs:
   using: "composite"
   steps:
@@ -38,7 +38,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/vtk_install
-        key: vtk-${{env.VTK_SHA_OR_TAG}}-${{runner.os}}-${{inputs.enable_raytracing}}-1
+        key: vtk-${{env.VTK_SHA_OR_TAG}}-${{runner.os}}-${{inputs.raytracing_label}}-1
 
     - name: Setup VTK
       if: steps.cache-vtk.outputs.cache-hit != 'true'
@@ -109,7 +109,7 @@ runs:
         -DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES
         -DVTK_MODULE_ENABLE_VTK_RenderingLabel=YES
         -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2=YES
-        -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing=${{ inputs.enable_raytracing == 'true' && 'YES' || 'DEFAULT' }}
+        -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing=${{ inputs.raytracing_label == 'raytracing' && 'YES' || 'DEFAULT' }}
         -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2=YES
         -DVTK_MODULE_ENABLE_VTK_TestingCore=YES
         -DVTK_VERSIONED_INSTALL=OFF

.github/workflows/ci.yml

@@ -22,22 +22,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu, windows, macos]
         vtk_version: [commit, v9.2.6, v9.1.0, v9.0.0]
-        macos_bundle: [true]
+        build_type: [standard]
         include:
-          - enable_raytracing: true
+          - raytracing_label: raytracing
+          - bundle_label: no-bundle
           - vtk_version: v9.0.0
-            enable_raytracing: false
-          - os: macos-latest
-            enable_raytracing: false #598
-          - macos_bundle: false
-            os: macos-latest
+            raytracing_label: no-raytracing
+          - os: windows
+            bundle_label: bundle #790
+          - os: macos
+            raytracing_label: no-raytracing #598
+          - build_type: macos_bundle
+            os: macos
             vtk_version: commit
-            enable_raytracing: false
+            raytracing_label: no-raytracing
+            bundle_label: bundle
 
-    runs-on: ${{matrix.os}}
-    container: ${{ matrix.os == 'ubuntu-latest' && 'ghcr.io/f3d-app/f3d-ci' || null }}
+    runs-on: ${{matrix.os}}-latest
+    container: ${{ matrix.os == 'ubuntu' && 'ghcr.io/f3d-app/f3d-ci' || null }}
 
     env:
       DISPLAY: :0
@@ -69,15 +73,15 @@ jobs:
         mkdir install
 
     - name: Install Raytracing Dependencies
-      if: matrix.enable_raytracing == true
+      if: matrix.raytracing_label == 'raytracing'
       uses: ./source/.github/actions/ospray-sb-install-dep
 
     - name: Install VTK dependency
       uses: ./source/.github/actions/vtk-install-dep
       with:
         vtk_version: ${{matrix.vtk_version}}
         vtk_sha_file: ./source/.github/actions/vtk_commit_sha
-        enable_raytracing: ${{matrix.enable_raytracing}}
+        raytracing_label: ${{matrix.raytracing_label}}
 
     - name: Install F3D dependencies
       uses: ./source/.github/actions/f3d-dependencies
@@ -125,10 +129,10 @@ jobs:
         -DF3D_BINDINGS_PYTHON=ON
         -DF3D_LINUX_GENERATE_MAN=ON
         -DF3D_LINUX_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX=ON
-        -DF3D_MACOS_BUNDLE=${{ matrix.macos_bundle == true && 'ON' || 'OFF' }}
+        -DF3D_MACOS_BUNDLE=${{ matrix.bundle_label == 'bundle' && 'ON' || 'OFF' }}
         -DF3D_MODULE_EXTERNAL_RENDERING=ON
-        -DF3D_MODULE_RAYTRACING=${{ matrix.enable_raytracing == true && 'ON' || 'OFF' }}
-        -DF3D_PLUGINS_STATIC_BUILD=${{ matrix.macos_bundle == true && 'ON' || 'OFF' }}
+        -DF3D_MODULE_RAYTRACING=${{ matrix.raytracing_label == 'raytracing' && 'ON' || 'OFF' }}
+        -DF3D_PLUGINS_STATIC_BUILD=${{ matrix.bundle_label == 'bundle' && 'ON' || 'OFF' }}
         -DF3D_PLUGIN_BUILD_ALEMBIC=ON
         -DF3D_PLUGIN_BUILD_ASSIMP=ON
         -DF3D_PLUGIN_BUILD_DRACO=ON
@@ -165,7 +169,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         path: ./build/Testing/Temporary
-        name: f3d-tests-artifact-${{runner.os}}-${{matrix.vtk_version}}
+        name: f3d-tests-artifact-${{runner.os}}-${{matrix.vtk_version}}-${{matrix.build_type}}
 
     - name: Install (ALL)
       working-directory: ${{github.workspace}}/build
@@ -225,14 +229,14 @@ jobs:
     - name: Set F3D binary path MacOS bundle
       if: |
         runner.os == 'macOS' &&
-        matrix.macos_bundle == true
+        matrix.bundle_label == 'bundle'
       shell: bash
       run: echo "F3D_BIN_PATH=./f3d.app/Contents/MacOS/f3d" >> $GITHUB_ENV
 
     - name: Set F3D binary path MacOS bundle
       if: |
         runner.os == 'macOS' &&
-        matrix.macos_bundle == false
+        matrix.bundle_label != 'bundle'
       shell: bash
       run: echo "F3D_BIN_PATH=./bin/f3d" >> $GITHUB_ENV
 
@@ -268,7 +272,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         path: ./install/output
-        name: f3d-tests-install-artifact-${{runner.os}}-${{matrix.vtk_version}}
+        name: f3d-tests-install-artifact-${{runner.os}}-${{matrix.vtk_version}}-${{matrix.build_type}}
 
 #----------------------------------------------------------------------------
 # Coverage: Build and test on linux with last VTK with coverage option
@@ -317,7 +321,7 @@ jobs:
       uses: ./source/.github/actions/vtk-install-dep
       with:
         vtk_sha_file: ./source/.github/actions/vtk_commit_sha
-        enable_raytracing: true
+        raytracing_label: raytracing
 
     - name: Install F3D dependencies
       uses: ./source/.github/actions/f3d-dependencies

.github/workflows/clean-caches.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   my-job:
     name: Delete all caches
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Clear caches