From 95a41e405e1d7b15c9f46884731360040088ffbf Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 11 Jan 2024 11:09:28 +0100 Subject: [PATCH 1/7] Fix pre-commit workflow Running the pre-commit locally didn't caused the issues that I see in the github actions, maybe removing the versions constraints can fix that. Signed-off-by: Michal Konecny --- .github/workflows/pre-commit.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 4697d367..11f87b28 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,9 +10,5 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/setup-python@v5.0.0 - - name: Install dependencies - run: | - pip install poetry==1.5.1 pylint==2.17.4 - poetry export --with dev --output requirements.txt - python -m pip install -r requirements.txt + - uses: snok/install-poetry@v1 - uses: pre-commit/action@v3.0.0 From 905d072feee94791cefe9d301783e0018b181cf9 Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 11 Jan 2024 11:16:46 +0100 Subject: [PATCH 2/7] Run the pre-commit manually in GitHub action The prepared GitHub action for pre-commit doesn't work well in our environment. Let's call it the same way as we do it locally. Signed-off-by: Michal Konecny --- .github/workflows/pre-commit.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 11f87b28..a1ef5f23 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -11,4 +11,8 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/setup-python@v5.0.0 - uses: snok/install-poetry@v1 - - uses: pre-commit/action@v3.0.0 + - name: Run pre-commit + run: | + poetry install + pre-commit run --show-diff-on-failure --color=always --all-files + From 8c4711c1e40e16644307fd58ee614d2ab03e04de Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 11 Jan 2024 11:24:28 +0100 Subject: [PATCH 3/7] Run pre-commit using poetry in github action Signed-off-by: Michal Konecny --- .github/workflows/pre-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index a1ef5f23..6bdb7148 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -14,5 +14,5 @@ jobs: - name: Run pre-commit run: | poetry install - pre-commit run --show-diff-on-failure --color=always --all-files + poetry run pre-commit run --show-diff-on-failure --color=always --all-files From 3e8fe251d4b35fbbeea057131cf9d371f9f14314 Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 11 Jan 2024 11:34:08 +0100 Subject: [PATCH 4/7] Bump python version to 3.11 in pre-commit action Signed-off-by: Michal Konecny --- .github/workflows/pre-commit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 6bdb7148..aa0acccb 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,6 +10,8 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/setup-python@v5.0.0 + with: + python-version: "3.11" - uses: snok/install-poetry@v1 - name: Run pre-commit run: | From 58c2b95f4fb84f46f02b0d3ff22b1b3737ca991c Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 11 Jan 2024 11:55:39 +0100 Subject: [PATCH 5/7] Use tox for running pre-commit Signed-off-by: Michal Konecny --- .github/workflows/pre-commit.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index aa0acccb..b5500311 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,11 +10,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/setup-python@v5.0.0 - with: - python-version: "3.11" - uses: snok/install-poetry@v1 - name: Run pre-commit run: | - poetry install - poetry run pre-commit run --show-diff-on-failure --color=always --all-files - + tox -e pre-commit From 968b11569d91db7ecfda507ad5ce81908a159050 Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 11 Jan 2024 11:57:02 +0100 Subject: [PATCH 6/7] Install the tox module before using it Signed-off-by: Michal Konecny --- .github/workflows/pre-commit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index b5500311..57478923 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,4 +13,5 @@ jobs: - uses: snok/install-poetry@v1 - name: Run pre-commit run: | + python -m pip install tox tox -e pre-commit From c79dc8851d36847d89c8d9f355ffb923bd9aa976 Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 11 Jan 2024 12:11:05 +0100 Subject: [PATCH 7/7] Try to remove the version constraints Signed-off-by: Michal Konecny --- .github/workflows/pre-commit.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 57478923..dff72fc6 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -11,7 +11,9 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/setup-python@v5.0.0 - uses: snok/install-poetry@v1 - - name: Run pre-commit + - name: Install dependencies run: | - python -m pip install tox - tox -e pre-commit + pip install poetry pylint + poetry export --with dev --output requirements.txt + python -m pip install -r requirements.txt + - uses: pre-commit/action@v3.0.0