From f71a0eefe1fe9147e17626fd5692bd1b3621a312 Mon Sep 17 00:00:00 2001 From: Alexander Druz Date: Thu, 21 Sep 2023 13:25:17 +0200 Subject: [PATCH 1/5] Use the right pip cache dir --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1dc9f3d3..966be706 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -373,6 +373,7 @@ jobs: with: fetch-depth: 0 - name: '🐍 Set up Poetry' + id: setup-poetry uses: ./.github/actions/setup-poetry with: python-version: ${{ matrix.python-version }} @@ -380,7 +381,7 @@ jobs: - name: Cache pip cache folder uses: actions/cache@v3 with: - path: ${{ needs.prepare-python.outputs.pip-cache-dir }} + path: ${{ steps.setup-poetry.outputs.pip-cache-dir }} key: pip-cache-${{ runner.os }}-python-${{ matrix.python-version }} - name: '📤 Restore Spotlight' uses: actions/download-artifact@v3 From 39e87053fd8001d1d5bc2a9c049d03bad930bb6e Mon Sep 17 00:00:00 2001 From: Alexander Druz Date: Thu, 21 Sep 2023 13:42:45 +0200 Subject: [PATCH 2/5] Debug integration test on Windows and MacOS --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 966be706..de5ce26e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,10 @@ jobs: with: matrix: | os: ubuntu-latest, - python-version: 3.8 3.9 3.10 3.11 + python-version: 3.8 + include: | + os: windows-latest python-version: 3.8, + os: macos-latest python-version: 3.8 - name: '🧱 Build test matrix for release' if: env.MATRIX == '' && startsWith(github.ref, 'refs/tags/v') uses: druzsan/setup-matrix@v1 @@ -294,9 +297,9 @@ jobs: - name: '🎨 Set up Chrome driver' if: matrix.browser == 'chrome' id: setup-chromedriver + uses: nanasess/setup-chromedriver@v2 with: chromedriver-version: '115.0.5790.102' - uses: nanasess/setup-chromedriver@v2 - name: '🦊 Set up Gecko driver' id: setup-geckodriver if: matrix.browser == 'firefox' From 1e8c9902eca4b1b723c6785aaeec7001a758a8da Mon Sep 17 00:00:00 2001 From: Alexander Druz Date: Thu, 21 Sep 2023 14:11:31 +0200 Subject: [PATCH 3/5] Fix version check in pre-commit hook --- pyproject.toml | 1 - scripts/check_dynamic_versioning.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 51aa1155..d891e398 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -138,7 +138,6 @@ files = [ ] [tool.ruff] -line-length = 100 ignore = [ "E501" ] diff --git a/scripts/check_dynamic_versioning.py b/scripts/check_dynamic_versioning.py index aa90caf2..1e5b98dd 100755 --- a/scripts/check_dynamic_versioning.py +++ b/scripts/check_dynamic_versioning.py @@ -13,7 +13,7 @@ errors = [] - if not pyproject["tool"]["poetry"]["version"]: + if pyproject["tool"]["poetry"]["version"] != "0.0.0": errors.append("Error: tool.poetry.version != 0.0.0") if not pyproject["tool"]["poetry-dynamic-versioning"]["enable"]: errors.append("Error: tool.poetry-dymamic-versioning.enable != true") From 846b89c3dbd3e47d29d49a9329760bb9b56b00fc Mon Sep 17 00:00:00 2001 From: Alexander Druz Date: Thu, 21 Sep 2023 14:30:04 +0200 Subject: [PATCH 4/5] Unpin chromedriver version in CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de5ce26e..6f524d1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -298,8 +298,8 @@ jobs: if: matrix.browser == 'chrome' id: setup-chromedriver uses: nanasess/setup-chromedriver@v2 - with: - chromedriver-version: '115.0.5790.102' + # with: + # chromedriver-version: '115.0.5790.102' - name: '🦊 Set up Gecko driver' id: setup-geckodriver if: matrix.browser == 'firefox' From a3045e546ecd15440c363c1e61ac395bc41e631f Mon Sep 17 00:00:00 2001 From: Alexander Druz Date: Thu, 21 Sep 2023 14:52:32 +0200 Subject: [PATCH 5/5] Revert CI debug --- .github/workflows/ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f524d1c..8c6ef304 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,10 +97,7 @@ jobs: with: matrix: | os: ubuntu-latest, - python-version: 3.8 - include: | - os: windows-latest python-version: 3.8, - os: macos-latest python-version: 3.8 + python-version: 3.8 3.9 3.10 3.11 - name: '🧱 Build test matrix for release' if: env.MATRIX == '' && startsWith(github.ref, 'refs/tags/v') uses: druzsan/setup-matrix@v1 @@ -298,8 +295,6 @@ jobs: if: matrix.browser == 'chrome' id: setup-chromedriver uses: nanasess/setup-chromedriver@v2 - # with: - # chromedriver-version: '115.0.5790.102' - name: '🦊 Set up Gecko driver' id: setup-geckodriver if: matrix.browser == 'firefox'