Skip to content

Commit f66f882

Browse files
committed
use shared workflows
1 parent 1a1941e commit f66f882

10 files changed

+36
-212
lines changed

.github/workflows/_check_changelog_entry.yaml renamed to .github/workflows/_changelog_entry_check.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Check changelog entry
1+
name: Changelog entry check
22

33
on:
44
workflow_call:
55

66
jobs:
77
check_changelog_entry:
8-
name: Check changelog entry
8+
name: Changelog entry check
99
runs-on: ubuntu-latest
1010
if: (!startsWith(github.event.pull_request.title, 'docs:'))
1111
env:
@@ -25,5 +25,5 @@ jobs:
2525
pipx install --python ${{ env.PYTHON_VERSION }} poetry
2626
make install-dev
2727
28-
- name: Check changelog entry
28+
- name: Execute changelog entry check
2929
run: make check-changelog-entry

.github/workflows/_check_docs_build.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/_integration_tests.yaml

Lines changed: 0 additions & 43 deletions
This file was deleted.

.github/workflows/_linting.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/_type_checking.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/_unit_tests.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/_check_version_conflict.yaml renamed to .github/workflows/_version_conflict_check.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Check version conflict
1+
name: Version conflict check
22

33
on:
44
workflow_call:
55

66
jobs:
77
check_version_conflict:
8-
name: Check version conflict
8+
name: Version conflict check
99
runs-on: ubuntu-latest
1010
if: (!startsWith(github.event.pull_request.title, 'docs:'))
1111
env:
@@ -25,5 +25,5 @@ jobs:
2525
pipx install --python ${{ env.PYTHON_VERSION }} poetry
2626
make install-dev
2727
28-
- name: Check version conflict
28+
- name: Execute version conflict check
2929
run: make check-version-conflict
File renamed without changes.

.github/workflows/run_code_checks.yaml

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,35 @@ on:
1111
workflow_call:
1212

1313
jobs:
14-
run_linting:
15-
name: Run linting
16-
uses: ./.github/workflows/_linting.yaml
14+
lint_check:
15+
name: Lint check
16+
uses: apify/workflows/.github/workflows/python/lint_check.yaml
1717

18-
run_type_checking:
19-
name: Run type checking
20-
uses: ./.github/workflows/_type_checking.yaml
18+
type_check:
19+
name: Type check
20+
uses: apify/workflows/.github/workflows/python/type_check.yaml
2121

22-
run_unit_tests:
23-
name: Run unit tests
24-
uses: ./.github/workflows/_unit_tests.yaml
22+
unit_tests:
23+
name: Unit tests
24+
uses: apify/workflows/.github/workflows/python/unit_tests.yaml
25+
secrets: inherit
2526

26-
check_changelog_entry:
27-
name: Check changelog entry
28-
uses: ./.github/workflows/_check_changelog_entry.yaml
27+
# TODO: remove this once https://github.com/apify/apify-sdk-python/issues/241 is resolved
28+
changelog_entry_check:
29+
name: Changelog entry check
30+
uses: ./.github/workflows/_changelog_entry_check.yaml
2931

30-
check_docs_build:
31-
name: Check docs build
32-
uses: ./.github/workflows/_check_docs_build.yaml
32+
# TODO: remove this once https://github.com/apify/apify-sdk-python/issues/241 is resolved
33+
version_conflict_check:
34+
name: Version conflict check
35+
uses: ./.github/workflows/_version_conflict_check.yaml
3336

34-
check_version_conflict:
35-
name: Check version conflict
36-
uses: ./.github/workflows/_check_version_conflict.yaml
37+
docs_check:
38+
name: Docs check
39+
uses: apify/workflows/.github/workflows/python/docs_check.yaml
40+
secrets: inherit
3741

38-
run_integration_tests:
39-
name: Run integration tests
40-
uses: ./.github/workflows/_integration_tests.yaml
42+
integration_tests:
43+
name: Integration tests
44+
uses: apify/workflows/.github/workflows/python/integration_tests.yaml
4145
secrets: inherit

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: clean install-dev build publish-to-pypi lint type-check unit-tests unit-tests-cov \
22
integration-tests format check-code check-version-availability check-changelog-entry \
3-
check-version-conflict build-api-reference run-doc
3+
check-version-conflict build-api-reference run-docs
44

55
DIRS_WITH_CODE = src tests scripts
66

@@ -55,5 +55,8 @@ check-code: lint type-check unit-tests check-changelog-entry check-version-confl
5555
build-api-reference:
5656
cd website && poetry run ./build_api_reference.sh
5757

58-
run-doc: build-api-reference
58+
build-docs: build-api-reference
59+
cd website && yarn && yarn build
60+
61+
run-docs: build-api-reference
5962
cd website && npm clean-install && npm run start

0 commit comments

Comments
 (0)