Merge remote-tracking branch 'upstream/8.0.x' into 8.0.x-deconflict

* upstream/8.0.x:
  Fix consolidation tutorial (cylc#5199)
  GH Actions Codecov upload: try using token arg (cylc#5179)

.github/workflows/test_fast.yml

@@ -25,8 +25,7 @@ jobs:
           - os: 'macos-latest'
             python-version: '3.7'
     env:
-      PYTEST_ADDOPTS: --cov --cov-append -n 5 --color=yes -m "linktest or not linktest"
-
+      PYTEST_ADDOPTS: --cov --cov-append -n 5 --color=yes
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -112,3 +111,9 @@ jobs:
           name: '${{ github.workflow }} ${{ matrix.os }} py-${{ matrix.python-version }}'
           flags: fast-tests
           fail_ci_if_error: true
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }} # Token not required for public repos, but might reduce chance of random 404 error?
+
+      - name: Linkcheck
+        if: startsWith(matrix.os, 'ubuntu')
+        run: pytest -m linkcheck tests/unit

.github/workflows/test_functional.yml

@@ -299,4 +299,6 @@ jobs:
         with:
           name: '${{ github.workflow }} ${{ matrix.name }} ${{ matrix.chunk }}'
           flags: functional-tests
-          fail_ci_if_error: false
+          fail_ci_if_error: true
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }} # Token not required for public repos, but might reduce chance of random 404 error?

CHANGES.md

@@ -40,6 +40,9 @@ Maintenance release.
 [#5196](https://github.com/cylc/cylc-flow/pull/5196) - Replace traceback
 with warning, for scan errors where workflow is stopped.
 
+[#5199](https://github.com/cylc/cylc-flow/pull/5199) - Fix a problem with
+the consolidation tutorial.
+
 -------------------------------------------------------------------------------
 ## __cylc-8.0.3 (<span actions:bind='release-date'>Released 2022-10-17</span>)__
 

cylc/flow/etc/tutorial/consolidation-tutorial/etc/met-office-sites.dat

@@ -0,0 +1 @@
+../../cylc-forecasting-workflow/etc/met-office-sites.dat

cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc

@@ -36,7 +36,7 @@
     [[get_observations_aldergrove]]
         script = get-observations
         [[[environment]]]
-            SITE_ID = 3976
+            SITE_ID = 3917
             API_KEY = DATAPOINT_API_KEY
     [[get_observations_camborne]]
         script = get-observations