From 86f328515c7f5403bb8c0aaa509bdaf5a39e992b Mon Sep 17 00:00:00 2001 From: Patrick Robertson Date: Fri, 28 Mar 2025 18:24:24 +0400 Subject: [PATCH 1/4] Use cache key that includes os version --- .github/workflows/tests-core.yaml | 3 +++ .github/workflows/tests-download.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/tests-core.yaml b/.github/workflows/tests-core.yaml index c839249..043aa5c 100644 --- a/.github/workflows/tests-core.yaml +++ b/.github/workflows/tests-core.yaml @@ -36,6 +36,9 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'poetry' + cache-dependency-path: | + poetry.lock + /etc/os-release - name: Install dependencies run: poetry install --no-interaction --with dev diff --git a/.github/workflows/tests-download.yaml b/.github/workflows/tests-download.yaml index 0aafdd6..1f0a683 100644 --- a/.github/workflows/tests-download.yaml +++ b/.github/workflows/tests-download.yaml @@ -40,6 +40,9 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'poetry' + cache-dependency-path: | + poetry.lock + /etc/os-release - name: Install dependencies run: poetry install --no-interaction --with dev From fd540bd03adfdf7b8fa7a93044e00b2174bb336a Mon Sep 17 00:00:00 2001 From: Patrick Robertson Date: Fri, 28 Mar 2025 18:26:14 +0400 Subject: [PATCH 2/4] Code change to trigger tests --- .../modules/timestamping_enricher/timestamping_enricher.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/auto_archiver/modules/timestamping_enricher/timestamping_enricher.py b/src/auto_archiver/modules/timestamping_enricher/timestamping_enricher.py index 680538b..412afa3 100644 --- a/src/auto_archiver/modules/timestamping_enricher/timestamping_enricher.py +++ b/src/auto_archiver/modules/timestamping_enricher/timestamping_enricher.py @@ -14,6 +14,7 @@ from rfc3161_client.tsp import SignedData from cryptography import x509 from cryptography.hazmat.primitives import serialization import certifi + from auto_archiver.core import Enricher from auto_archiver.core import Metadata, Media from auto_archiver.version import __version__ From 85d3f2fa02c0063eb064ec27fba413ecb04c016d Mon Sep 17 00:00:00 2001 From: Patrick Robertson Date: Fri, 28 Mar 2025 18:36:11 +0400 Subject: [PATCH 3/4] Revert changes --- .github/workflows/tests-core.yaml | 3 --- .github/workflows/tests-download.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/tests-core.yaml b/.github/workflows/tests-core.yaml index 043aa5c..c839249 100644 --- a/.github/workflows/tests-core.yaml +++ b/.github/workflows/tests-core.yaml @@ -36,9 +36,6 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'poetry' - cache-dependency-path: | - poetry.lock - /etc/os-release - name: Install dependencies run: poetry install --no-interaction --with dev diff --git a/.github/workflows/tests-download.yaml b/.github/workflows/tests-download.yaml index 1f0a683..0aafdd6 100644 --- a/.github/workflows/tests-download.yaml +++ b/.github/workflows/tests-download.yaml @@ -40,9 +40,6 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'poetry' - cache-dependency-path: | - poetry.lock - /etc/os-release - name: Install dependencies run: poetry install --no-interaction --with dev From 0ce7f5a1b587032318b3c249f837eb23274175da Mon Sep 17 00:00:00 2001 From: Patrick Robertson Date: Fri, 28 Mar 2025 18:40:02 +0400 Subject: [PATCH 4/4] Disable caching --- .github/workflows/tests-core.yaml | 1 - .github/workflows/tests-download.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/tests-core.yaml b/.github/workflows/tests-core.yaml index c839249..e0a66d1 100644 --- a/.github/workflows/tests-core.yaml +++ b/.github/workflows/tests-core.yaml @@ -35,7 +35,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'poetry' - name: Install dependencies run: poetry install --no-interaction --with dev diff --git a/.github/workflows/tests-download.yaml b/.github/workflows/tests-download.yaml index 0aafdd6..4cd51f5 100644 --- a/.github/workflows/tests-download.yaml +++ b/.github/workflows/tests-download.yaml @@ -39,7 +39,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'poetry' - name: Install dependencies run: poetry install --no-interaction --with dev