From 36fed75cfde9cd233af9adee2906fabec11dd4e3 Mon Sep 17 00:00:00 2001 From: David Orme Date: Tue, 6 Feb 2024 10:30:52 +0000 Subject: [PATCH 1/5] Updating GitHub Actions to new Node20 versions --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ecbad93a..0b836ce17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,8 +6,8 @@ jobs: qa: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: "3.10" - uses: pre-commit/action@v3.0.0 @@ -22,9 +22,9 @@ jobs: python-version: [ "3.10", "3.11" ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -47,8 +47,8 @@ jobs: needs: qa runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: "3.10" From 2f3f5e9de41a9095811b571c5e8ae89d4b9a7a79 Mon Sep 17 00:00:00 2001 From: David Orme Date: Tue, 6 Feb 2024 10:47:15 +0000 Subject: [PATCH 2/5] Updating codecov and crossing fingers --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b836ce17..6d172646a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: - name: Upload coverage to Codecov if: (matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10') - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 docs_build: needs: qa From 1ad61b031392a6bcae827b21497b56976db01264 Mon Sep 17 00:00:00 2001 From: David Orme Date: Tue, 6 Feb 2024 10:59:14 +0000 Subject: [PATCH 3/5] Adding required token - not sure it is set in the repo secrets though --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d172646a..a6328589c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,8 @@ jobs: - name: Upload coverage to Codecov if: (matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10') uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} docs_build: needs: qa From 90d870ad44a11f6775c3b2adc0bf58beee630dd5 Mon Sep 17 00:00:00 2001 From: David Orme Date: Wed, 7 Feb 2024 10:07:13 +0000 Subject: [PATCH 4/5] Copying over codecov action updates from #385 --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6328589c..8722f6e2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,8 +43,9 @@ jobs: if: (matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10') uses: codecov/codecov-action@v4 with: - token: ${{ secrets.CODECOV_TOKEN }} - + fail_ci_if_error: true + token: ${{ secrets.CODECOV_TOKEN }} + verbose: true docs_build: needs: qa runs-on: ubuntu-latest From 331a54e09d78f037d2657dade849fea5710a16f6 Mon Sep 17 00:00:00 2001 From: David Orme Date: Wed, 7 Feb 2024 13:15:18 +0000 Subject: [PATCH 5/5] Adding pre-commit.ci badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5b494e854..d9a944c2a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Welcome to the Virtual Rainforest [![codecov](https://codecov.io/gh/ImperialCollegeLondon/virtual_rainforest/branch/develop/graph/badge.svg)](https://codecov.io/gh/ImperialCollegeLondon/virtual_rainforest) +[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/ImperialCollegeLondon/virtual_rainforest/develop.svg)](https://results.pre-commit.ci/latest/github/ImperialCollegeLondon/virtual_rainforest/develop) This repository is the home for the development of the Virtual Rainforest. The Virtual Rainforest is a project to develop a simulation of all of the major