diff --git a/.github/actions/install-linux/action.yml b/.github/actions/install-linux/action.yml index 7af4706912..0f5d857cf8 100644 --- a/.github/actions/install-linux/action.yml +++ b/.github/actions/install-linux/action.yml @@ -32,7 +32,7 @@ runs: renku/templates key: ${{ env.DEPENDENCY_CACHE_PREFIX }}-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}-${{ hashFiles('Makefile') }} env: - DEPENDENCY_CACHE_PREFIX: "v1" + DEPENDENCY_CACHE_PREFIX: "20230929" - name: Install dependencies if: steps.dependency-cache.outputs.cache-hit != 'true' || 'refs/heads/master' == github.ref || 'refs/heads/develop' == github.ref || startsWith(github.ref, 'refs/tags/') env: @@ -65,7 +65,7 @@ runs: path: cassettes key: ${{ env.NETWORK_CACHE_PREFIX }}-${{ steps.year-week.outputs.date }}-${{ hashFiles('poetry.lock') }}-${{ github.job }} env: - NETWORK_CACHE_PREFIX: "v1" + NETWORK_CACHE_PREFIX: "20230929" - name: Set coveralls path mapping shell: bash run: | diff --git a/.github/actions/install-macos/action.yml b/.github/actions/install-macos/action.yml index d5d952d96e..ac96da4e04 100644 --- a/.github/actions/install-macos/action.yml +++ b/.github/actions/install-macos/action.yml @@ -46,4 +46,4 @@ runs: path: cassettes key: ${{ env.NETWORK_CACHE_PREFIX }}-${{ steps.year-week.outputs.date }}-${{ hashFiles('poetry.lock') }}-${{ github.job }} env: - NETWORK_CACHE_PREFIX: "v1" + NETWORK_CACHE_PREFIX: "20230929" diff --git a/tests/cli/test_template.py b/tests/cli/test_template.py index a38348683a..8030c7bb6a 100644 --- a/tests/cli/test_template.py +++ b/tests/cli/test_template.py @@ -91,7 +91,7 @@ def test_template_show(isolated_runner): result = isolated_runner.invoke(cli, command + ["R-minimal"]) assert 0 == result.exit_code, format_result_exception(result) - assert re.search("^Name: Basic R (.*) Project$", result.output, re.MULTILINE) is not None + assert re.search("^Name: R (.*) Project$", result.output, re.MULTILINE) is not None finally: sys.argv = argv @@ -101,7 +101,7 @@ def test_template_show_no_id(runner, project): result = runner.invoke(cli, ["template", "show"]) assert 0 == result.exit_code, format_result_exception(result) - assert re.search("^Name: Basic Python (.*) Project$", result.output, re.MULTILINE) is not None + assert re.search("^Name: Python (.*) Project$", result.output, re.MULTILINE) is not None def test_template_show_no_id_outside_project(isolated_runner):