Merge branch 'add-earthkit-plots' of https://github.com/ecmwf-actions…

…/downstream-ci into add-earthkit-plots
ecmwf-actions · May 2, 2024 · 35ed12c · 35ed12c
2 parents 1d8a2ad + cb69de2
commit 35ed12c
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 41 deletions.
diff --git a/.github/workflows/downstream-ci-hpc.yml b/.github/workflows/downstream-ci-hpc.yml
@@ -11,15 +11,15 @@ name: downstream-ci-hpc
       earthkit-data:
         required: false
         type: string
-      earthkit-plots:
-        required: false
-        type: string
       earthkit-geo:
         required: false
         type: string
       earthkit-meteo:
         required: false
         type: string
+      earthkit-plots:
+        required: false
+        type: string
       earthkit-regrid:
         required: false
         type: string
@@ -86,9 +86,9 @@ jobs:
       atlas: ${{ steps.setup.outputs.atlas }}
       cfgrib: ${{ steps.setup.outputs.cfgrib }}
       earthkit-data: ${{ steps.setup.outputs.earthkit-data }}
-      earthkit-plots: ${{ steps.setup.outputs.earthkit-plots }}
       earthkit-geo: ${{ steps.setup.outputs.earthkit-geo }}
       earthkit-meteo: ${{ steps.setup.outputs.earthkit-meteo }}
+      earthkit-plots: ${{ steps.setup.outputs.earthkit-plots }}
       earthkit-regrid: ${{ steps.setup.outputs.earthkit-regrid }}
       eccodes: ${{ steps.setup.outputs.eccodes }}
       eccodes-python: ${{ steps.setup.outputs.eccodes-python }}
@@ -140,26 +140,26 @@ jobs:
             develop_branch: develop
             input: ${{ inputs.earthkit-data }}
             optional_matrix: null
-          ecmwf/earthkit-plots:
+          ecmwf/earthkit-geo:
             path: .github/ci-hpc-config.yml
             python: true
             master_branch: main
             develop_branch: develop
-            input: ${{ inputs.earthkit-plots }}
+            input: ${{ inputs.earthkit-geo }}
             optional_matrix: null
-          ecmwf/earthkit-geo:
+          ecmwf/earthkit-meteo:
             path: .github/ci-hpc-config.yml
             python: true
             master_branch: main
             develop_branch: develop
-            input: ${{ inputs.earthkit-geo }}
+            input: ${{ inputs.earthkit-meteo }}
             optional_matrix: null
-          ecmwf/earthkit-meteo:
+          ecmwf/earthkit-plots:
             path: .github/ci-hpc-config.yml
             python: true
             master_branch: main
             develop_branch: develop
-            input: ${{ inputs.earthkit-meteo }}
+            input: ${{ inputs.earthkit-plots }}
             optional_matrix: null
           ecmwf/earthkit-regrid:
             path: .github/ci-hpc-config.yml
@@ -437,14 +437,14 @@ jobs:
           ${{ inputs.eccodes-python }}
           ${{ inputs.pyodc }}
         python_requirements: tests/downstream-ci-requirements.txt
-  earthkit-plots:
-    name: earthkit-plots
+  earthkit-geo:
+    name: earthkit-geo
     needs:
     - setup
-    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-plots && (inputs.earthkit-plots) }}
+    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-geo && (inputs.earthkit-geo) }}
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.setup.outputs.earthkit-plots) }}
+      matrix: ${{ fromJson(needs.setup.outputs.earthkit-geo) }}
     env:
       DEP_TREE: ${{ needs.setup.outputs.dep_tree }}
     runs-on:
@@ -462,14 +462,14 @@ jobs:
         dependencies: ''
         python_dependencies: ''
         python_requirements: tests/downstream-ci-requirements.txt
-  earthkit-geo:
-    name: earthkit-geo
+  earthkit-meteo:
+    name: earthkit-meteo
     needs:
     - setup
-    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-geo && (inputs.earthkit-geo) }}
+    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-meteo && (inputs.earthkit-meteo) }}
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.setup.outputs.earthkit-geo) }}
+      matrix: ${{ fromJson(needs.setup.outputs.earthkit-meteo) }}
     env:
       DEP_TREE: ${{ needs.setup.outputs.dep_tree }}
     runs-on:
@@ -487,14 +487,14 @@ jobs:
         dependencies: ''
         python_dependencies: ''
         python_requirements: tests/downstream-ci-requirements.txt
-  earthkit-meteo:
-    name: earthkit-meteo
+  earthkit-plots:
+    name: earthkit-plots
     needs:
     - setup
-    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-meteo && (inputs.earthkit-meteo) }}
+    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-plots && (inputs.earthkit-plots) }}
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.setup.outputs.earthkit-meteo) }}
+      matrix: ${{ fromJson(needs.setup.outputs.earthkit-plots) }}
     env:
       DEP_TREE: ${{ needs.setup.outputs.dep_tree }}
     runs-on:

diff --git a/.github/workflows/downstream-ci.yml b/.github/workflows/downstream-ci.yml
@@ -102,9 +102,9 @@ jobs:
       atlas: ${{ steps.setup.outputs.atlas }}
       cfgrib: ${{ steps.setup.outputs.cfgrib }}
       earthkit-data: ${{ steps.setup.outputs.earthkit-data }}
-      earthkit-plots: ${{ steps.setup.outputs.earthkit-plots }}
       earthkit-geo: ${{ steps.setup.outputs.earthkit-geo }}
       earthkit-meteo: ${{ steps.setup.outputs.earthkit-meteo }}
+      earthkit-plots: ${{ steps.setup.outputs.earthkit-plots }}
       earthkit-regrid: ${{ steps.setup.outputs.earthkit-regrid }}
       eccodes: ${{ steps.setup.outputs.eccodes }}
       eccodes-python: ${{ steps.setup.outputs.eccodes-python }}
@@ -158,26 +158,26 @@ jobs:
             develop_branch: develop
             input: ${{ inputs.earthkit-data }}
             optional_matrix: null
-          ecmwf/earthkit-plots:
+          ecmwf/earthkit-geo:
             path: ''
             python: true
             master_branch: main
             develop_branch: develop
-            input: ${{ inputs.earthkit-plots }}
+            input: ${{ inputs.earthkit-geo }}
             optional_matrix: null
-          ecmwf/earthkit-geo:
+          ecmwf/earthkit-meteo:
             path: ''
             python: true
             master_branch: main
             develop_branch: develop
-            input: ${{ inputs.earthkit-geo }}
+            input: ${{ inputs.earthkit-meteo }}
             optional_matrix: null
-          ecmwf/earthkit-meteo:
+          ecmwf/earthkit-plots:
             path: ''
             python: true
             master_branch: main
             develop_branch: develop
-            input: ${{ inputs.earthkit-meteo }}
+            input: ${{ inputs.earthkit-plots }}
             optional_matrix: null
           ecmwf/earthkit-regrid:
             path: ''
@@ -590,15 +590,15 @@ jobs:
           python -m pytest -v -m 'notebook'
           python -m pytest --forked -vv -m 'no_cache_init'
           python -m coverage report
-  earthkit-plots:
-    name: earthkit-plots
+  earthkit-geo:
+    name: earthkit-geo
     needs:
     - setup
     - python-qa
-    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-plots && (inputs.earthkit-plots) }}
+    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-geo && (inputs.earthkit-geo) }}
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.setup.outputs.earthkit-plots) }}
+      matrix: ${{ fromJson(needs.setup.outputs.earthkit-geo) }}
     env:
       DEP_TREE: ${{ needs.setup.outputs.dep_tree }}
     runs-on: ${{ matrix.labels }}
@@ -611,15 +611,15 @@ jobs:
         codecov_upload: ${{ needs.setup.outputs.trigger_repo == github.job && inputs.codecov_upload && needs.setup.outputs.py_codecov_platform == matrix.name }}
         codecov_token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
         requirements_path: tests/downstream-ci-requirements.txt
-  earthkit-geo:
-    name: earthkit-geo
+  earthkit-meteo:
+    name: earthkit-meteo
     needs:
     - setup
     - python-qa
-    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-geo && (inputs.earthkit-geo) }}
+    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-meteo && (inputs.earthkit-meteo) }}
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.setup.outputs.earthkit-geo) }}
+      matrix: ${{ fromJson(needs.setup.outputs.earthkit-meteo) }}
     env:
       DEP_TREE: ${{ needs.setup.outputs.dep_tree }}
     runs-on: ${{ matrix.labels }}
@@ -632,15 +632,15 @@ jobs:
         codecov_upload: ${{ needs.setup.outputs.trigger_repo == github.job && inputs.codecov_upload && needs.setup.outputs.py_codecov_platform == matrix.name }}
         codecov_token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
         requirements_path: tests/downstream-ci-requirements.txt
-  earthkit-meteo:
-    name: earthkit-meteo
+  earthkit-plots:
+    name: earthkit-plots
     needs:
     - setup
     - python-qa
-    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-meteo && (inputs.earthkit-meteo) }}
+    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-plots && (inputs.earthkit-plots) }}
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.setup.outputs.earthkit-meteo) }}
+      matrix: ${{ fromJson(needs.setup.outputs.earthkit-plots) }}
     env:
       DEP_TREE: ${{ needs.setup.outputs.dep_tree }}
     runs-on: ${{ matrix.labels }}