add option to not build naavre-jupyter for given flavors

QCDIS · Feb 16, 2024 · 4a6ed8b · 4a6ed8b
1 parent d2beb84
commit 4a6ed8b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/make-flavor.yaml b/.github/workflows/make-flavor.yaml
@@ -19,6 +19,10 @@ on:
         description: 'NaaVRE base image version'
         type: string
         required: true
+      build_jupyter:
+        description: 'Whether to build the NaaVRE Jupyter images'
+        type: boolean
+        required: true
 
 jobs:
   build-naavre-cell-build:
@@ -48,6 +52,7 @@ jobs:
       image_repo: ${{ inputs.image_repo }}
       image_version: ${{ inputs.naavre_version }}-${{ inputs.image_version }}
       naavre_version: ${{ inputs.naavre_version }}
+    if: ${{ inputs.build_jupyter }}
 
   test:
     uses: ./.github/workflows/test-naavre-cell.yaml
@@ -80,4 +85,4 @@ jobs:
     with:
       image_name: naavre-jupyter-${{ inputs.flavor_name }}
       image_repo: ${{ inputs.image_repo }}
-    if: ${{ github.event_name == 'release' }}
+    if: ${{ github.event_name == 'release' && inputs.build_jupyter }}
diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml
@@ -16,14 +16,14 @@ jobs:
     name: List flavors
     runs-on: ubuntu-latest
     outputs:
-      flavors: ${{ steps.list-flavors.outputs.flavors }}
+      matrix: ${{ steps.list-flavors.outputs.matrix }}
     steps:
       - uses: actions/checkout@v4
       - id: list-flavors
         name: List flavors
         run: |
-          flavors=$(find ./flavors -mindepth 1 -maxdepth 1 -type d | jq -Rsc 'split("\n")[:-1] | map(split("/")[-1])')
-          echo "flavors=$flavors" | tee -a $GITHUB_OUTPUT
+          matrix=$(find ./flavors -mindepth 2 -maxdepth 2 -name 'flavor_config.yaml' | xargs yq ea -o=j -I=0 '[.]')
+          echo "matrix={\"include\":$(echo $matrix)}" >> $GITHUB_OUTPUT
 
   flavors:
     name: Flavor ${{ matrix.flavor_name }}
@@ -34,6 +34,6 @@ jobs:
       image_repo: 'ghcr.io/qcdis/naavre'
       image_version: ${{ github.ref_type == 'tag' && github.ref_name || github.sha }}
       naavre_version: 'v2.3.3-beta'
+      build_jupyter: ${{ matrix.build_jupyter }}
     strategy:
-      matrix:
-        flavor_name: ${{ fromJson(needs.list-flavors.outputs.flavors) }}
+      matrix: ${{ fromJson(needs.list-flavors.outputs.matrix) }}
diff --git a/flavors/laserfarm/flavor_config.yaml b/flavors/laserfarm/flavor_config.yaml
@@ -0,0 +1,2 @@
+flavor_name: laserfarm
+build_jupyter: True
diff --git a/flavors/lter-life-veluwe/flavor_config.yaml b/flavors/lter-life-veluwe/flavor_config.yaml
@@ -0,0 +1,2 @@
+flavor_name: lter-life-veluwe
+build_jupyter: True
diff --git a/flavors/python/flavor_config.yaml b/flavors/python/flavor_config.yaml
@@ -0,0 +1,2 @@
+flavor_name: python
+build_jupyter: False
diff --git a/flavors/r/flavor_config.yaml b/flavors/r/flavor_config.yaml
@@ -0,0 +1,2 @@
+flavor_name: r
+build_jupyter: False
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		flavor_name: lter-life-veluwe
		build_jupyter: True