wip

.cirrus.yml

@@ -40,11 +40,11 @@ env:
 #
 lint_task:
   auto_cancellation: true
-  name: "Lint: flake8 and black"
+  name: "${CIRRUS_OS}: py${PYTHON_VERSION} flake8 and black"
   pip_cache:
     folder: ~/.cache/pip
     fingerprint_script:
-      - echo "${CIRRUS_OS} py${PYTHON_VERSION}"
+      - echo "${CIRRUS_TASK_NAME}"
       - echo "$(date +%Y).$(($(date +%U) / ${CACHE_PERIOD})):${PIP_CACHE_BUILD} ${PIP_CACHE_PACKAGES}"
   lint_script:
     - pip list
@@ -84,7 +84,7 @@ linux_task_template: &LINUX_TASK_TEMPLATE
   nox_cache:
     folder: ${CIRRUS_WORKING_DIR}/.nox
     fingerprint_script:
-      - echo "${CIRRUS_OS} tests ${PY_VER}"
+      - echo "${CIRRUS_TASK_NAME}"
       - echo "$(date +%Y).$(($(date +%U) / ${CACHE_PERIOD})):${NOX_CACHE_BUILD}"
       - sha256sum ${CIRRUS_WORKING_DIR}/requirements/ci/py$(echo ${PY_VER} | tr -d ".").yml
 
@@ -98,14 +98,13 @@ linux_minimal_task:
       PY_VER: 3.6
     env:
       PY_VER: 3.7
-  name: "Linux: py${PY_VER} tests (minimal)"
+  name: "${CIRRUS_OS}: py${PY_VER} tests (minimal)"
   container:
     image: gcc:latest
     cpu: 2
     memory: 4G
   << : *LINUX_TASK_TEMPLATE
   tests_script:
-    - echo "CIRRUS_TASK_NAME = <${CIRRUS_TASK_NAME}>"
     - echo "[Resources]" > ${SITE_CFG}
     - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs/iris" >> ${SITE_CFG}
     - nox --session tests
@@ -120,7 +119,7 @@ linux_task:
       PY_VER: 3.6
     env:
       PY_VER: 3.7
-  name: "Linux: py${PY_VER} tests (full)"
+  name: "${CIRRUS_OS}: py${PY_VER} tests (full)"
   container:
     image: gcc:latest
     cpu: 6
@@ -135,7 +134,6 @@ linux_task:
       - mv iris-test-data-$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//") ${IRIS_TEST_DATA_DIR}
   << : *LINUX_TASK_TEMPLATE
   tests_script:
-    - echo "CIRRUS_TASK_NAME = <${CIRRUS_TASK_NAME}>"
     - echo "[Resources]" > ${SITE_CFG}
     - echo "test_data_dir = ${IRIS_TEST_DATA_DIR}/test_data" >> ${SITE_CFG}
     - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs/iris" >> ${SITE_CFG}
@@ -151,7 +149,7 @@ gallery_task:
       PY_VER: 3.6
     env:
       PY_VER: 3.7
-  name: "Linux: py${PY_VER} doc tests (gallery)"
+  name: "${CIRRUS_OS}: py${PY_VER} doc tests (gallery)"
   container:
     image: gcc:latest
     cpu: 2
@@ -166,7 +164,6 @@ gallery_task:
       - mv iris-test-data-$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//") ${IRIS_TEST_DATA_DIR}
   << : *LINUX_TASK_TEMPLATE
   tests_script:
-    - echo "CIRRUS_TASK_NAME = <${CIRRUS_TASK_NAME}>"
     - echo "[Resources]" > ${SITE_CFG}
     - echo "test_data_dir = ${IRIS_TEST_DATA_DIR}/test_data" >> ${SITE_CFG}
     - echo "doc_dir = ${CIRRUS_WORKING_DIR}/docs/iris" >> ${SITE_CFG}
@@ -180,7 +177,7 @@ doctest_task:
   matrix:
     env:
       PY_VER: 3.7
-  name: "Linux: py${PY_VER} doc tests"
+  name: "${CIRRUS_OS}: py${PY_VER} doc tests"
   container:
     image: gcc:latest
     cpu: 2
@@ -214,7 +211,7 @@ link_task:
   matrix:
     env:
       PY_VER: 3.7
-  name: "Linux: py${PY_VER} doc link check"
+  name: "${CIRRUS_OS}: py${PY_VER} doc link check"
   container:
     image: gcc:latest
     cpu: 2