composite iris-data-cache action

Author: bjlittle

.github/workflows/ci-docs-tests.yml

@@ -46,21 +46,11 @@ jobs:
           echo "LOCK_FILE=requirements/ci/nox.lock/py$(echo ${{ matrix.python-version }} | tr -d '.')-linux-64.lock" >> ${GITHUB_ENV}
 
       - name: "data cache"
-        uses: actions/cache@v3
-        id: data-cache
-        env:
-          # Increment the build number to force a cache refresh.
-          CACHE_BUILD: 0
+        uses: ./.github/workflows/composite/iris-data-cache
         with:
-          path: ~/iris-test-data
-          key: ${{ runner.os }}-iris-test-data-${{ env.ENV_NAME }}-v${{ env.IRIS_TEST_DATA_VERSION }}-b${{ env.CACHE_BUILD }}
-
-      - name: "data cache populate"
-        if: steps.data-cache.outputs.cache-hit != 'true'
-        run: |
-          wget --quiet https://github.com/SciTools/iris-test-data/archive/v${{ env.IRIS_TEST_DATA_VERSION }}.zip -O iris-test-data.zip
-          unzip -q iris-test-data.zip
-          mv iris-test-data-${{ env.IRIS_TEST_DATA_VERSION }} ${HOME}/iris-test-data
+          # Increment the build number to force a cache refresh.
+          cache_build: 0
+          version: ${{ env.IRIS_TEST_DATA_VERSION }}
 
       - name: "conda package cache"
         uses: actions/cache@v3

.github/workflows/ci-tests.yml

@@ -46,21 +46,11 @@ jobs:
           echo "LOCK_FILE=requirements/ci/nox.lock/py$(echo ${{ matrix.python-version }} | tr -d '.')-linux-64.lock" >> ${GITHUB_ENV}
 
       - name: "data cache"
-        uses: actions/cache@v3
-        id: data-cache
-        env:
-          # Increment the build number to force a cache refresh.
-          CACHE_BUILD: 0
+        uses: ./.github/workflows/composite/iris-data-cache
         with:
-          path: ~/iris-test-data
-          key: ${{ runner.os }}-iris-test-data-${{ env.ENV_NAME }}-v${{ env.IRIS_TEST_DATA_VERSION }}-b${{ env.CACHE_BUILD }}
-
-      - name: "data cache populate"
-        if: steps.data-cache.outputs.cache-hit != 'true'
-        run: |
-          wget --quiet https://github.com/SciTools/iris-test-data/archive/v${{ env.IRIS_TEST_DATA_VERSION }}.zip -O iris-test-data.zip
-          unzip -q iris-test-data.zip
-          mv iris-test-data-${{ env.IRIS_TEST_DATA_VERSION }} ${HOME}/iris-test-data
+          # Increment the build number to force a cache refresh.
+          cache_build: 0
+          version: ${{ env.IRIS_TEST_DATA_VERSION }}
 
       - name: "conda package cache"
         uses: actions/cache@v3

.github/workflows/composite/iris-data-cache/action.yml

@@ -0,0 +1,31 @@
+name: "iris-data-cache"
+description: "cache the iris test data"
+
+#
+# Assumes the environment contains the following variables:
+#   - ENV_NAME
+#   - HOME
+#
+inputs:
+  cache_build:
+    description: "data cache version build number"
+    required: false
+    default: "0"
+  version:
+    description: "iris test data version"
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/cache@v3
+      id: data-cache
+      with:
+        path: ~/iris-test-data
+        key: ${{ runner.os }}-iris-test-data-${{ env.ENV_NAME }}-v${{ inputs.version }}-b${{ inputs.cache_build }}
+
+    - if: steps.data-cache.outputs.cache-hit != 'true'
+      run: |
+        wget --quiet https://github.com/SciTools/iris-test-data/archive/v${{ inputs.version }}.zip -O iris-test-data.zip
+        unzip -q iris-test-data.zip
+        mv iris-test-data-${{ inputs.version }} ${HOME}/iris-test-data

.github/workflows/composite/nox-cache/action.yml

@@ -18,4 +18,4 @@ runs:
     - uses: actions/cache@v3
       with:
         path: ${{ github.workspace }}/.nox
-        key: ${{ runner.os }}-nox-${{ env.ENV_NAME }}-py${{ matrix.python-version }}-b${{ inputs.cache_build }}-${{ hashFiles(env.LOCK_FILE) }}
+        key: ${{ runner.os }}-nox-${{ env.ENV_NAME }}-py${{ matrix.python-version }}-b${{ inputs.cache_build }}-${{ hashFiles(env.LOCK_FILE) }}