Skip to content

Commit 9a91deb

Browse files
committed
fix
1 parent 4281f37 commit 9a91deb

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

.github/workflows/on_master.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ jobs:
2323
uses: ./.github/workflows/tests.yaml
2424
secrets: inherit
2525

26-
build_and_deploy_docs:
27-
name: Build and deploy docs
28-
needs: [doc_checks]
29-
uses: ./.github/workflows/docs.yaml
30-
with:
31-
ref: ${{ needs.update_changelog.outputs.changelog_commitish }}
32-
secrets: inherit
33-
3426
pre_release:
3527
name: Pre-release
3628
needs: [code_checks, tests]
3729
uses: ./.github/workflows/pre_release.yaml
3830
secrets: inherit
31+
32+
build_and_deploy_docs:
33+
name: Build and deploy docs
34+
needs: [doc_checks, pre_release]
35+
uses: ./.github/workflows/docs.yaml
36+
with:
37+
ref: ${{ needs.pre_release.outputs.changelog_commitish }}
38+
secrets: inherit

.github/workflows/pre_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
publish_to_pypi:
4242
if: "!startsWith(github.event.head_commit.message, 'ci') && !startsWith(github.event.head_commit.message, 'docs')"
4343
name: Publish to PyPI
44-
needs: [update_changelog]
44+
needs: [release_metadata, update_changelog]
4545
runs-on: ubuntu-latest
4646
permissions:
4747
contents: write

.github/workflows/release.yaml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,21 @@ concurrency:
2626
cancel-in-progress: false
2727

2828
jobs:
29+
lint_check:
30+
name: Lint check
31+
uses: apify/workflows/.github/workflows/python_lint_check.yaml@main
32+
with:
33+
python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
34+
35+
type_check:
36+
name: Type check
37+
uses: apify/workflows/.github/workflows/python_type_check.yaml@main
38+
with:
39+
python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
40+
2941
release_metadata:
3042
name: Prepare release metadata
43+
needs: [lint_check, type_check]
3144
runs-on: ubuntu-latest
3245
outputs:
3346
version_number: ${{ steps.release_metadata.outputs.version_number }}
@@ -43,21 +56,9 @@ jobs:
4356
custom_version: ${{ inputs.custom_version }}
4457
existing_changelog_path: CHANGELOG.md
4558

46-
lint_check:
47-
name: Lint check
48-
uses: apify/workflows/.github/workflows/python_lint_check.yaml@main
49-
with:
50-
python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
51-
52-
type_check:
53-
name: Type check
54-
uses: apify/workflows/.github/workflows/python_type_check.yaml@main
55-
with:
56-
python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
57-
5859
update_changelog:
5960
name: Update changelog
60-
needs: [release_metadata, lint_check, type_check]
61+
needs: [release_metadata]
6162
uses: apify/workflows/.github/workflows/python_bump_and_update_changelog.yaml@main
6263
with:
6364
version_number: ${{ needs.release_metadata.outputs.version_number }}
@@ -67,7 +68,7 @@ jobs:
6768

6869
create_github_release:
6970
name: Create GitHub release
70-
needs: [update_changelog]
71+
needs: [release_metadata, update_changelog]
7172
runs-on: ubuntu-latest
7273
env:
7374
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -82,7 +83,7 @@ jobs:
8283

8384
publish_to_pypi:
8485
name: Publish to PyPI
85-
needs: [update_changelog]
86+
needs: [release_metadata, update_changelog]
8687
runs-on: ubuntu-latest
8788
permissions:
8889
contents: write

0 commit comments

Comments
 (0)