Merge pull request #2689 from metomi/2.0.x

2.0.x
metomi · Apr 19, 2023 · 64925a8 · 64925a8
2 parents f869eaf + 3f41454
commit 64925a8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 55 deletions.
diff --git a/.github/actions/install-libs/action.yml b/.github/actions/install-libs/action.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,11 +17,17 @@ on:
       fcm_repo:
         description: The FCM repo to test against
         required: false
-      cylc_flow_ref:
-        description: The Cylc branch to test against
+      cylc_flow_tag:
+        description: The cylc-flow branch to test against
         required: false
       cylc_flow_repo:
-        description: The Cylc repo to test against
+        description: The cylc-flow repo to test against
+        required: false
+      cylc_rose_tag:
+        description: The cylc-rose branch to test against
+        required: false
+      cylc_rose_repo:
+        description: The cylc-rose repo to test against
         required: false
   schedule:
   - cron: '37 04 * * 1-5' # 03:37, Monday-Friday
@@ -100,12 +106,17 @@ jobs:
           pip install ."[all]"
           yarn install
 
-      - name: Install Cylc libs
-        uses: ./rose/.github/actions/install-libs
+      - name: Install Cylc
+        uses: cylc/release-actions/install-cylc-components@v1
         with:
-          cylc-flow-repo: ${{ inputs.cylc_flow_repo }}
-          cylc-flow-ref: ${{ inputs.cylc_flow_ref }}
-          cylc-rose-ref: ${{ inputs.cylc_rose_ref }}
+          cylc_flow: true
+          cylc_flow_opts: ''
+          cylc_flow_repo: ${{ inputs.cylc_flow_repo || 'cylc/cylc-flow' }}
+          cylc_flow_tag: ${{ inputs.cylc_flow_tag }}
+          cylc_rose: true
+          cylc_rose_opts: ''
+          cylc_rose_repo: ${{ inputs.cylc_rose_repo || 'cylc/cylc-rose' }}
+          cylc_rose_tag: ${{ inputs.cylc_rose_tag }}
 
       - name: Checkout FCM
         if: startsWith(matrix.os, 'ubuntu')
@@ -211,12 +222,17 @@ jobs:
         run: |
           pip install -e .[docs,graph]
 
-      - name: Install Cylc libs
-        uses: ./.github/actions/install-libs
+      - name: Install Cylc
+        uses: cylc/release-actions/install-cylc-components@v1
         with:
-          cylc-flow-repo: ${{ inputs.cylc_flow_repo }}
-          cylc-flow-ref: ${{ inputs.cylc_flow_ref }}
-          cylc-rose-ref: ${{ inputs.cylc_rose_ref }}
+          cylc_flow: true
+          cylc_flow_opts: ''
+          cylc_flow_repo: ${{ inputs.cylc_flow_repo || 'cylc/cylc-flow' }}
+          cylc_flow_tag: ${{ inputs.cylc_flow_tag }}
+          cylc_rose: true
+          cylc_rose_opts: ''
+          cylc_rose_repo: ${{ inputs.cylc_rose_repo || 'cylc/cylc-rose' }}
+          cylc_rose_tag: ${{ inputs.cylc_rose_tag }}
 
       - name: build (html)
         run: |