From 414d00ce3b0542f6e3727728eeb2bc15ad037e2a Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Tue, 25 Oct 2022 11:42:27 +0100
Subject: [PATCH 1/2] GH Actions Codecov upload: try using token arg (#5179)

* Hopefully will help reduce random 404 errors
* GH Actions: use token arg for codecov uploader
* GH Actions: skip linktest on MacOS
* codecov-action: turn on verbose mode
---
 .github/workflows/test_fast.yml       | 9 +++++++--
 .github/workflows/test_functional.yml | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test_fast.yml b/.github/workflows/test_fast.yml
index a927e46e0f0..35ab6813994 100644
--- a/.github/workflows/test_fast.yml
+++ b/.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
diff --git a/.github/workflows/test_functional.yml b/.github/workflows/test_functional.yml
index d494b283d02..de41a80971c 100644
--- a/.github/workflows/test_functional.yml
+++ b/.github/workflows/test_functional.yml
@@ -292,4 +292,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?

From 1939932b3205cdc9729f1a04035d7a1db6eef37c Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Tue, 25 Oct 2022 11:51:53 +0100
Subject: [PATCH 2/2] Fix consolidation tutorial (#5199)

* Fix tutorials
* Update changelog [skip ci]
---
 CHANGES.md                                                    | 4 ++++
 .../tutorial/consolidation-tutorial/etc/met-office-sites.dat  | 1 +
 cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc       | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 120000 cylc/flow/etc/tutorial/consolidation-tutorial/etc/met-office-sites.dat

diff --git a/CHANGES.md b/CHANGES.md
index f267363c943..aea79d81ab2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -39,6 +39,10 @@ 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>)__
 
 Maintenance release.
diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/etc/met-office-sites.dat b/cylc/flow/etc/tutorial/consolidation-tutorial/etc/met-office-sites.dat
new file mode 120000
index 00000000000..1fd679655f8
--- /dev/null
+++ b/cylc/flow/etc/tutorial/consolidation-tutorial/etc/met-office-sites.dat
@@ -0,0 +1 @@
+../../cylc-forecasting-workflow/etc/met-office-sites.dat
\ No newline at end of file
diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc
index dd3c6c65b28..5cff672eb71 100644
--- a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc
+++ b/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