From b5fa13c5d7ffbfc65b2270e527b7c365749e4ccd Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Thu, 3 Jul 2025 14:18:21 +0200 Subject: [PATCH 1/3] ci: Update Python versions for code checks --- .github/workflows/pre_release.yaml | 12 ++++++++++++ .github/workflows/release.yaml | 12 ++++++++++++ .github/workflows/run_code_checks.yaml | 12 ++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index d3f54af3..48e5bda0 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -11,6 +11,10 @@ on: # Or it can be triggered manually. workflow_dispatch: +env: + PYTHON_VERSIONS: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + PYTHON_VERSIONS_INTEGRATION_TESTS: '["3.9", "3.13"]' + jobs: release_metadata: if: "!startsWith(github.event.head_commit.message, 'docs') && !startsWith(github.event.head_commit.message, 'ci') && startsWith(github.repository, 'apify/')" @@ -31,19 +35,27 @@ jobs: lint_check: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main + with: + python-version: ${{ env.PYTHON_VERSIONS }} type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main + with: + python-version: ${{ env.PYTHON_VERSIONS }} unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main + with: + python-version: ${{ env.PYTHON_VERSIONS }} integration_tests: name: Integration tests uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit + with: + python-version: ${{ env.PYTHON_VERSIONS_INTEGRATION_TESTS }} update_changelog: name: Update changelog diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 51420b33..925105c0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,6 +21,10 @@ on: type: string default: "" +env: + PYTHON_VERSIONS: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + PYTHON_VERSIONS_INTEGRATION_TESTS: '["3.9", "3.13"]' + jobs: release_metadata: name: Prepare release metadata @@ -42,19 +46,27 @@ jobs: lint_check: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main + with: + python-version: ${{ env.PYTHON_VERSIONS }} type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main + with: + python-version: ${{ env.PYTHON_VERSIONS }} unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main + with: + python-version: ${{ env.PYTHON_VERSIONS }} integration_tests: name: Integration tests uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit + with: + python-version: ${{ env.PYTHON_VERSIONS_INTEGRATION_TESTS }} update_changelog: name: Update changelog diff --git a/.github/workflows/run_code_checks.yaml b/.github/workflows/run_code_checks.yaml index 12633880..1998df8e 100644 --- a/.github/workflows/run_code_checks.yaml +++ b/.github/workflows/run_code_checks.yaml @@ -6,24 +6,28 @@ on: # step required for PRs from forks. This prevents their potential exposure. pull_request: +env: + PYTHON_VERSIONS: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + PYTHON_VERSIONS_INTEGRATION_TESTS: '["3.9", "3.13"]' + jobs: lint_check: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-version: ${{ env.PYTHON_VERSIONS }} type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-version: ${{ env.PYTHON_VERSIONS }} unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-version: ${{ env.PYTHON_VERSIONS }} docs_check: name: Docs check @@ -35,4 +39,4 @@ jobs: uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit with: - python-version: '["3.9", "3.13"]' + python-version: ${{ env.PYTHON_VERSIONS_INTEGRATION_TESTS }} From 4aa71344fb61375a8ebe7c8a0ff250c3aeeeb033 Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Thu, 3 Jul 2025 14:55:06 +0200 Subject: [PATCH 2/3] fix ci --- .github/workflows/pre_release.yaml | 12 ++++-------- .github/workflows/release.yaml | 12 ++++-------- .github/workflows/run_code_checks.yaml | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index 48e5bda0..4381796e 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -11,10 +11,6 @@ on: # Or it can be triggered manually. workflow_dispatch: -env: - PYTHON_VERSIONS: '["3.9", "3.10", "3.11", "3.12", "3.13"]' - PYTHON_VERSIONS_INTEGRATION_TESTS: '["3.9", "3.13"]' - jobs: release_metadata: if: "!startsWith(github.event.head_commit.message, 'docs') && !startsWith(github.event.head_commit.message, 'ci') && startsWith(github.repository, 'apify/')" @@ -36,26 +32,26 @@ jobs: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' integration_tests: name: Integration tests uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit with: - python-version: ${{ env.PYTHON_VERSIONS_INTEGRATION_TESTS }} + python-version: '["3.9", "3.13"]' update_changelog: name: Update changelog diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 925105c0..99cbff94 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,10 +21,6 @@ on: type: string default: "" -env: - PYTHON_VERSIONS: '["3.9", "3.10", "3.11", "3.12", "3.13"]' - PYTHON_VERSIONS_INTEGRATION_TESTS: '["3.9", "3.13"]' - jobs: release_metadata: name: Prepare release metadata @@ -47,26 +43,26 @@ jobs: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' integration_tests: name: Integration tests uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit with: - python-version: ${{ env.PYTHON_VERSIONS_INTEGRATION_TESTS }} + python-version: '["3.9", "3.13"]' update_changelog: name: Update changelog diff --git a/.github/workflows/run_code_checks.yaml b/.github/workflows/run_code_checks.yaml index 1998df8e..12633880 100644 --- a/.github/workflows/run_code_checks.yaml +++ b/.github/workflows/run_code_checks.yaml @@ -6,28 +6,24 @@ on: # step required for PRs from forks. This prevents their potential exposure. pull_request: -env: - PYTHON_VERSIONS: '["3.9", "3.10", "3.11", "3.12", "3.13"]' - PYTHON_VERSIONS_INTEGRATION_TESTS: '["3.9", "3.13"]' - jobs: lint_check: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main with: - python-version: ${{ env.PYTHON_VERSIONS }} + python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' docs_check: name: Docs check @@ -39,4 +35,4 @@ jobs: uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit with: - python-version: ${{ env.PYTHON_VERSIONS_INTEGRATION_TESTS }} + python-version: '["3.9", "3.13"]' From 941b9d8893f643a4ed05038e0a3b047b0d9083dc Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Thu, 3 Jul 2025 15:28:10 +0200 Subject: [PATCH 3/3] versions --- .github/workflows/pre_release.yaml | 6 +++--- .github/workflows/release.yaml | 6 +++--- .github/workflows/run_code_checks.yaml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index 4381796e..7e7c69ba 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -32,19 +32,19 @@ jobs: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' integration_tests: name: Integration tests diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 99cbff94..a5a63500 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -43,19 +43,19 @@ jobs: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' integration_tests: name: Integration tests diff --git a/.github/workflows/run_code_checks.yaml b/.github/workflows/run_code_checks.yaml index 12633880..b1de7e4a 100644 --- a/.github/workflows/run_code_checks.yaml +++ b/.github/workflows/run_code_checks.yaml @@ -11,19 +11,19 @@ jobs: name: Lint check uses: apify/workflows/.github/workflows/python_lint_check.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' type_check: name: Type check uses: apify/workflows/.github/workflows/python_type_check.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' unit_tests: name: Unit tests uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main with: - python-version: '["3.9", "3.10", "3.11", "3.12", "3.13"]' + python-versions: '["3.9", "3.10", "3.11", "3.12", "3.13"]' docs_check: name: Docs check @@ -35,4 +35,4 @@ jobs: uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit with: - python-version: '["3.9", "3.13"]' + python-versions: '["3.9", "3.13"]'