diff --git a/.github/workflows/test_fast.yml b/.github/workflows/test_fast.yml index 192dd7d10fa..4cd3203f848 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 6c884127a01..7546bd4e192 100644 --- a/.github/workflows/test_functional.yml +++ b/.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? diff --git a/CHANGES.md b/CHANGES.md index 674c4239cf6..14cf41a720f 100644 --- a/CHANGES.md +++ b/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 (Released 2022-10-17)__ 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