From 283ec81b576c06320dfe0f1b52033c678e06b77d Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Tue, 15 Oct 2024 18:59:16 +0200 Subject: [PATCH 1/5] ci: fix python version reference --- .github/workflows/build_and_deploy_docs.yaml | 2 +- .github/workflows/run_release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_deploy_docs.yaml b/.github/workflows/build_and_deploy_docs.yaml index e34a428a..3e7dc146 100644 --- a/.github/workflows/build_and_deploy_docs.yaml +++ b/.github/workflows/build_and_deploy_docs.yaml @@ -55,7 +55,7 @@ jobs: - name: Install Python dependencies run: | - pipx install --python ${{ matrix.python-version }} poetry + pipx install --python ${{ env.PYTHON_VERSION }} poetry make install-dev - name: Build generated API reference diff --git a/.github/workflows/run_release.yaml b/.github/workflows/run_release.yaml index c2759794..3bd770ce 100644 --- a/.github/workflows/run_release.yaml +++ b/.github/workflows/run_release.yaml @@ -98,7 +98,7 @@ jobs: - name: Install Python dependencies run: | - pipx install --python ${{ matrix.python-version }} poetry + pipx install --python ${{ env.PYTHON_VERSION }} poetry make install-dev - # Determine if this is a prerelease or latest release From aa27fe6881e02dbc22ef952cf93d95326cf80f1a Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Tue, 15 Oct 2024 21:12:46 +0200 Subject: [PATCH 2/5] fix shared workflows reference --- .github/workflows/run_code_checks.yaml | 10 +++++----- .github/workflows/run_release.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_code_checks.yaml b/.github/workflows/run_code_checks.yaml index 00a381fe..6c820bdd 100644 --- a/.github/workflows/run_code_checks.yaml +++ b/.github/workflows/run_code_checks.yaml @@ -13,15 +13,15 @@ on: jobs: lint_check: name: Lint check - uses: apify/workflows/.github/workflows/python/lint_check.yaml + uses: apify/workflows/.github/workflows/python/lint_check.yaml@main type_check: name: Type check - uses: apify/workflows/.github/workflows/python/type_check.yaml + uses: apify/workflows/.github/workflows/python/type_check.yaml@main unit_tests: name: Unit tests - uses: apify/workflows/.github/workflows/python/unit_tests.yaml + uses: apify/workflows/.github/workflows/python/unit_tests.yaml@main # TODO: remove this once https://github.com/apify/apify-sdk-python/issues/241 is resolved changelog_entry_check: @@ -35,9 +35,9 @@ jobs: docs_check: name: Docs check - uses: apify/workflows/.github/workflows/python/docs_check.yaml + uses: apify/workflows/.github/workflows/python/docs_check.yaml@main integration_tests: name: Integration tests - uses: apify/workflows/.github/workflows/python/integration_tests.yaml + uses: apify/workflows/.github/workflows/python/integration_tests.yaml@main secrets: inherit diff --git a/.github/workflows/run_release.yaml b/.github/workflows/run_release.yaml index 3bd770ce..40ebcded 100644 --- a/.github/workflows/run_release.yaml +++ b/.github/workflows/run_release.yaml @@ -37,17 +37,17 @@ jobs: lint_check: name: Lint check needs: [should_release] - uses: apify/workflows/.github/workflows/python/lint_check.yaml + uses: apify/workflows/.github/workflows/python/lint_check.yaml@main type_check: name: Type check needs: [should_release] - uses: apify/workflows/.github/workflows/python/type_check.yaml + uses: apify/workflows/.github/workflows/python/type_check.yaml@main unit_tests: name: Unit tests needs: [should_release] - uses: apify/workflows/.github/workflows/python/unit_tests.yaml + uses: apify/workflows/.github/workflows/python/unit_tests.yaml@main # TODO: remove this once https://github.com/apify/apify-sdk-python/issues/241 is resolved changelog_entry_check: @@ -64,7 +64,7 @@ jobs: integration_tests: name: Integration tests needs: [should_release] - uses: apify/workflows/.github/workflows/python/integration_tests.yaml + uses: apify/workflows/.github/workflows/python/integration_tests.yaml@main secrets: inherit publish_to_pypi: From f3ddd95073ff173c5c3b074c433fd703d9c34dcd Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Tue, 15 Oct 2024 21:14:24 +0200 Subject: [PATCH 3/5] update path to shared workflows --- .github/workflows/run_code_checks.yaml | 10 +++++----- .github/workflows/run_release.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_code_checks.yaml b/.github/workflows/run_code_checks.yaml index 6c820bdd..1286b998 100644 --- a/.github/workflows/run_code_checks.yaml +++ b/.github/workflows/run_code_checks.yaml @@ -13,15 +13,15 @@ on: jobs: lint_check: name: Lint check - uses: apify/workflows/.github/workflows/python/lint_check.yaml@main + uses: apify/workflows/.github/workflows/python_lint_check.yaml@main type_check: name: Type check - uses: apify/workflows/.github/workflows/python/type_check.yaml@main + uses: apify/workflows/.github/workflows/python_type_check.yaml@main unit_tests: name: Unit tests - uses: apify/workflows/.github/workflows/python/unit_tests.yaml@main + uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main # TODO: remove this once https://github.com/apify/apify-sdk-python/issues/241 is resolved changelog_entry_check: @@ -35,9 +35,9 @@ jobs: docs_check: name: Docs check - uses: apify/workflows/.github/workflows/python/docs_check.yaml@main + uses: apify/workflows/.github/workflows/python_docs_check.yaml@main integration_tests: name: Integration tests - uses: apify/workflows/.github/workflows/python/integration_tests.yaml@main + uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit diff --git a/.github/workflows/run_release.yaml b/.github/workflows/run_release.yaml index 40ebcded..dd76911d 100644 --- a/.github/workflows/run_release.yaml +++ b/.github/workflows/run_release.yaml @@ -37,17 +37,17 @@ jobs: lint_check: name: Lint check needs: [should_release] - uses: apify/workflows/.github/workflows/python/lint_check.yaml@main + uses: apify/workflows/.github/workflows/python_lint_check.yaml@main type_check: name: Type check needs: [should_release] - uses: apify/workflows/.github/workflows/python/type_check.yaml@main + uses: apify/workflows/.github/workflows/python_type_check.yaml@main unit_tests: name: Unit tests needs: [should_release] - uses: apify/workflows/.github/workflows/python/unit_tests.yaml@main + uses: apify/workflows/.github/workflows/python_unit_tests.yaml@main # TODO: remove this once https://github.com/apify/apify-sdk-python/issues/241 is resolved changelog_entry_check: @@ -64,7 +64,7 @@ jobs: integration_tests: name: Integration tests needs: [should_release] - uses: apify/workflows/.github/workflows/python/integration_tests.yaml@main + uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit publish_to_pypi: From 47ddbd292b3ba9e204fa3e466305b5c5ead19e3b Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Wed, 16 Oct 2024 10:04:02 +0200 Subject: [PATCH 4/5] use pull request for code checks --- .github/workflows/run_code_checks.yaml | 16 ++++++++++------ .github/workflows/run_release.yaml | 8 +++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_code_checks.yaml b/.github/workflows/run_code_checks.yaml index 1286b998..59627ede 100644 --- a/.github/workflows/run_code_checks.yaml +++ b/.github/workflows/run_code_checks.yaml @@ -2,13 +2,16 @@ name: Run code checks on: # Trigger code checks on opening a new pull request. - pull_request_target: + # Secrets are only made available to the integration tests job, with a manual approval + # step required for PRs from forks. This prevents their potential exposure. + pull_request: - # Do not trigger code checks on push to the master branch, as they will be triggered - # by the release workflow. - - # Trigger code checks on workflow call (e.g. from run release workflow). - workflow_call: + # Trigger code checks on pushing to the master branch. + push: + branches: + - master + tags-ignore: + - "**" jobs: lint_check: @@ -39,5 +42,6 @@ jobs: integration_tests: name: Integration tests + needs: [lint_check, type_check, unit_tests, changelog_entry_check, version_conflict_check, docs_check] uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit diff --git a/.github/workflows/run_release.yaml b/.github/workflows/run_release.yaml index dd76911d..45626a7a 100644 --- a/.github/workflows/run_release.yaml +++ b/.github/workflows/run_release.yaml @@ -1,16 +1,18 @@ name: Run release on: - # Push to master will publish a beta version + # Push to master will publish a beta version. push: branches: - master tags-ignore: - "**" - # A release via GitHub releases will publish a stable version + + # A release via GitHub releases will publish a stable version. release: types: [published] - # Workflow dispatch will publish whatever you choose + + # Workflow dispatch will publish whatever you choose. workflow_dispatch: inputs: release_type: From bdef4fba5d80341e8b1a15a78af32c70e96aa5d4 Mon Sep 17 00:00:00 2001 From: Vlada Dusek Date: Wed, 16 Oct 2024 10:13:32 +0200 Subject: [PATCH 5/5] fix docs check --- .github/workflows/run_code_checks.yaml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_code_checks.yaml b/.github/workflows/run_code_checks.yaml index 59627ede..1515a820 100644 --- a/.github/workflows/run_code_checks.yaml +++ b/.github/workflows/run_code_checks.yaml @@ -42,6 +42,6 @@ jobs: integration_tests: name: Integration tests - needs: [lint_check, type_check, unit_tests, changelog_entry_check, version_conflict_check, docs_check] + needs: [lint_check, type_check, unit_tests] uses: apify/workflows/.github/workflows/python_integration_tests.yaml@main secrets: inherit diff --git a/Makefile b/Makefile index b51c1572..d3a97e21 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ build-api-reference: cd website && poetry run ./build_api_reference.sh build-docs: build-api-reference - cd website && yarn && yarn build + cd website && npm clean-install && npm run build run-docs: build-api-reference cd website && npm clean-install && npm run start