From 17544140fbea8e7ce22b0db1292a4e879964bffd Mon Sep 17 00:00:00 2001 From: Ivan Gabaldon Date: Thu, 19 Feb 2026 10:37:20 +0100 Subject: [PATCH] [fix] ci: cache keys (#5745) YAML block (literal) scalar style also takes quotes into account: Expected: `container-amd64-20260216-acbc0ea29f44f7fc7eeadcf91d421c66f26dbbdd48cc284691f8fd8982ab7323, container-amd64-20260216-, container-amd64-` Got: `container-amd64-20260216-acbc0ea29f44f7fc7eeadcf91d421c66f26dbbdd48cc284691f8fd8982ab7323, "container-amd64-20260216-", "container-amd64-"` --- .github/workflows/checker.yml | 3 ++- .github/workflows/container.yml | 7 ++++--- .github/workflows/data-update.yml | 3 ++- .github/workflows/documentation.yml | 3 ++- .github/workflows/integration.yml | 6 ++++-- .github/workflows/l10n.yml | 6 ++++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/checker.yml b/.github/workflows/checker.yml index 6f1481425..66c91d0cd 100644 --- a/.github/workflows/checker.yml +++ b/.github/workflows/checker.yml @@ -37,7 +37,8 @@ jobs: uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}" - restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-" + restore-keys: | + python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}- path: "./local" - name: Setup venv diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index db5b87fba..e02282bd7 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -87,7 +87,8 @@ jobs: uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}" - restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-" + restore-keys: | + python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}- path: "./local/" - name: Get date @@ -99,8 +100,8 @@ jobs: with: key: "container-${{ matrix.arch }}-${{ steps.date.outputs.date }}-${{ hashFiles('./requirements*.txt') }}" restore-keys: | - "container-${{ matrix.arch }}-${{ steps.date.outputs.date }}-" - "container-${{ matrix.arch }}-" + container-${{ matrix.arch }}-${{ steps.date.outputs.date }}- + container-${{ matrix.arch }}- path: "/var/tmp/buildah-cache-*/*" - if: ${{ matrix.emulation }} diff --git a/.github/workflows/data-update.yml b/.github/workflows/data-update.yml index 0fdf170ce..19cc86960 100644 --- a/.github/workflows/data-update.yml +++ b/.github/workflows/data-update.yml @@ -54,7 +54,8 @@ jobs: uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}" - restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-" + restore-keys: | + python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}- path: "./local/" - name: Setup venv diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index aeeb9ec89..8bbca5e52 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -46,7 +46,8 @@ jobs: uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}" - restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-" + restore-keys: | + python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}- path: "./local/" - name: Setup venv diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 2c761bab3..08a899e63 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -48,7 +48,8 @@ jobs: uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: key: "python-${{ matrix.python-version }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}" - restore-keys: "python-${{ matrix.python-version }}-${{ runner.arch }}-" + restore-keys: | + python-${{ matrix.python-version }}-${{ runner.arch }}- path: "./local/" - name: Setup venv @@ -86,7 +87,8 @@ jobs: uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}" - restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-" + restore-keys: | + python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}- path: "./local/" - name: Setup venv diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml index f140bcc1f..b56f14f1a 100644 --- a/.github/workflows/l10n.yml +++ b/.github/workflows/l10n.yml @@ -49,7 +49,8 @@ jobs: uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}" - restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-" + restore-keys: | + python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}- path: "./local/" - name: Setup venv @@ -96,7 +97,8 @@ jobs: uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3 with: key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}" - restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-" + restore-keys: | + python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}- path: "./local/" - name: Setup venv