From 0789d7af1fbb8a886da969ef1a98b16fbc71e25d Mon Sep 17 00:00:00 2001 From: Niklas Netter Date: Tue, 22 Oct 2024 10:36:15 +0200 Subject: [PATCH 1/3] ci: upgrade artifact actions to v4 --- .../.github/workflows/tests.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_name}}/.github/workflows/tests.yml b/{{cookiecutter.project_name}}/.github/workflows/tests.yml index 6df1e5463..d6023d749 100644 --- a/{{cookiecutter.project_name}}/.github/workflows/tests.yml +++ b/{{cookiecutter.project_name}}/.github/workflows/tests.yml @@ -97,14 +97,15 @@ jobs: - name: Upload coverage data if: always() && matrix.session == 'tests' - uses: "actions/upload-artifact@v3" + uses: actions/upload-artifact@v4 with: - name: coverage-data + name: coverage-data-${{ matrix.python }}-${{ matrix.os }} path: ".coverage.*" + include-hidden-files: true - name: Upload documentation if: matrix.session == 'docs-build' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: docs path: docs/_build @@ -138,9 +139,10 @@ jobs: nox --version - name: Download coverage data - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: coverage-data + pattern: coverage-data-* + merge-multiple: true - name: Combine coverage data and display human readable report run: | From 9418c86bfa2d93569fe4f922afcb760cd84c1000 Mon Sep 17 00:00:00 2001 From: Niklas Netter Date: Tue, 22 Oct 2024 10:45:26 +0200 Subject: [PATCH 2/3] fix: correct notation for {{ and }} in template --- {{cookiecutter.project_name}}/.github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_name}}/.github/workflows/tests.yml b/{{cookiecutter.project_name}}/.github/workflows/tests.yml index d6023d749..8ef6c42fb 100644 --- a/{{cookiecutter.project_name}}/.github/workflows/tests.yml +++ b/{{cookiecutter.project_name}}/.github/workflows/tests.yml @@ -99,7 +99,7 @@ jobs: if: always() && matrix.session == 'tests' uses: actions/upload-artifact@v4 with: - name: coverage-data-${{ matrix.python }}-${{ matrix.os }} + name: coverage-data-${{"{{"}} matrix.python {{"}}"}}-${{"{{"}} matrix.os {{"}}"}} path: ".coverage.*" include-hidden-files: true From c560c261c60715e9b00f723c3a3e2abd31fe1326 Mon Sep 17 00:00:00 2001 From: Niklas Netter Date: Tue, 22 Oct 2024 15:02:38 +0200 Subject: [PATCH 3/3] refactor: use jinja {% raw %} --- {{cookiecutter.project_name}}/.github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_name}}/.github/workflows/tests.yml b/{{cookiecutter.project_name}}/.github/workflows/tests.yml index 8ef6c42fb..9b5804f9c 100644 --- a/{{cookiecutter.project_name}}/.github/workflows/tests.yml +++ b/{{cookiecutter.project_name}}/.github/workflows/tests.yml @@ -99,7 +99,9 @@ jobs: if: always() && matrix.session == 'tests' uses: actions/upload-artifact@v4 with: - name: coverage-data-${{"{{"}} matrix.python {{"}}"}}-${{"{{"}} matrix.os {{"}}"}} +{% raw %} + name: coverage-data-${{ matrix.python }}-${{ matrix.os }} +{% endraw %} path: ".coverage.*" include-hidden-files: true