Merge pull request #75 from ecmwf-actions/ecflow-main

ecflow and ecflow-light to use main as stable branches
ecmwf-actions · Dec 6, 2024 · 9442e23 · 9442e23
2 parents 65a08ad + 1cb09f7
commit 9442e23
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/downstream-ci-hpc.yml b/.github/workflows/downstream-ci-hpc.yml
@@ -455,7 +455,7 @@ jobs:
           ecmwf/ecflow:
             path: .github/ci-hpc-config.yml
             python: false
-            master_branch: master
+            master_branch: main
             develop_branch: develop
             input: ${{ steps.prepare-inputs.outputs.ecflow }}
             optional_matrix:
@@ -465,7 +465,7 @@ jobs:
           ecmwf/ecflow-light:
             path: .github/ci-hpc-config.yml
             python: false
-            master_branch: master
+            master_branch: main
             develop_branch: develop
             input: ${{ steps.prepare-inputs.outputs.ecflow-light }}
             optional_matrix: null

diff --git a/.github/workflows/downstream-ci.yml b/.github/workflows/downstream-ci.yml
@@ -473,7 +473,7 @@ jobs:
           ecmwf/ecflow:
             path: .github/ci-config.yml
             python: false
-            master_branch: master
+            master_branch: main
             develop_branch: develop
             input: ${{ steps.prepare-inputs.outputs.ecflow }}
             optional_matrix:
@@ -483,7 +483,7 @@ jobs:
           ecmwf/ecflow-light:
             path: .github/ci-config.yml
             python: false
-            master_branch: master
+            master_branch: main
             develop_branch: develop
             input: ${{ steps.prepare-inputs.outputs.ecflow-light }}
             optional_matrix: null

diff --git a/dependency_tree.yml b/dependency_tree.yml
@@ -202,6 +202,7 @@ eccodes-python:
 
 ecflow:
   type: cmake
+  master_branch: main
   deps:
     - ecbuild
   optional_matrix:
@@ -215,6 +216,7 @@ ecflow:
 
 ecflow-light:
   type: cmake
+  master_branch: main
   deps:
     - eckit