Skip to content

Commit 87da98c

Browse files
committed
Merge branch 'master' into chore/regenerate-lockfile
2 parents a076634 + 7136290 commit 87da98c

File tree

13 files changed

+181
-10
lines changed

13 files changed

+181
-10
lines changed

.github/workflows/_check_code.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
# Runs when invoked by another workflow.
88
workflow_call:
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
actions_lint_check:
1215
name: Actions lint check

.github/workflows/_check_docs.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
# Runs when invoked by another workflow.
88
workflow_call:
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
doc_checks:
1215
name: Doc checks

.github/workflows/_check_docstrings.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
# Runs when invoked by another workflow.
88
workflow_call:
99

10+
permissions:
11+
contents: read
12+
1013
env:
1114
PYTHON_VERSION: 3.14
1215

.github/workflows/_release_docs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ jobs:
6868
run: uv run poe build-docs
6969
env:
7070
APIFY_SIGNING_TOKEN: ${{ secrets.APIFY_SIGNING_TOKEN }}
71+
SEGMENT_TOKEN: ${{ secrets.SEGMENT_TOKEN }}
7172

7273
- name: Set up GitHub Pages
7374
uses: actions/configure-pages@v5

.github/workflows/_tests.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
# Runs when invoked by another workflow.
88
workflow_call:
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
unit_tests:
1215
name: Unit tests

.github/workflows/manual_release_stable.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ concurrency:
2525
group: release
2626
cancel-in-progress: false
2727

28+
permissions:
29+
contents: read
30+
2831
jobs:
2932
code_checks:
3033
name: Code checks
@@ -51,6 +54,8 @@ jobs:
5154
changelog_update:
5255
name: Changelog update
5356
needs: [release_prepare]
57+
permissions:
58+
contents: write
5459
uses: apify/workflows/.github/workflows/python_bump_and_update_changelog.yaml@main
5560
with:
5661
version_number: ${{ needs.release_prepare.outputs.version_number }}
@@ -61,6 +66,8 @@ jobs:
6166
name: GitHub release
6267
needs: [release_prepare, changelog_update]
6368
runs-on: ubuntu-latest
69+
permissions:
70+
contents: write
6471
env:
6572
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6673
steps:

.github/workflows/on_master.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ concurrency:
1111
group: release
1212
cancel-in-progress: false
1313

14+
permissions:
15+
contents: read
16+
1417
jobs:
1518
doc_checks:
1619
name: Doc checks
@@ -21,6 +24,10 @@ jobs:
2124
if: "startsWith(github.event.head_commit.message, 'docs') && startsWith(github.repository, 'apify/')"
2225
name: Doc release
2326
needs: [doc_checks]
27+
permissions:
28+
contents: write
29+
pages: write
30+
id-token: write
2431
uses: ./.github/workflows/_release_docs.yaml
2532
with:
2633
# Use the same ref as the one that triggered the workflow.
@@ -63,6 +70,8 @@ jobs:
6370
changelog_update:
6471
name: Changelog update
6572
needs: [release_prepare]
73+
permissions:
74+
contents: write
6675
uses: apify/workflows/.github/workflows/python_bump_and_update_changelog.yaml@main
6776
with:
6877
version_number: ${{ needs.release_prepare.outputs.version_number }}
@@ -94,6 +103,10 @@ jobs:
94103
doc_release_post_publish:
95104
name: Doc release post publish
96105
needs: [changelog_update, pypi_publish]
106+
permissions:
107+
contents: write
108+
pages: write
109+
id-token: write
97110
uses: ./.github/workflows/_release_docs.yaml
98111
with:
99112
# Use the ref from the changelog update to include the updated changelog.

.github/workflows/on_pull_request.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
# Runs whenever a pull request is opened or updated.
55
pull_request:
66

7+
permissions:
8+
contents: read
9+
pull-requests: read
10+
711
jobs:
812
pr_title_check:
913
name: PR title check

CONTRIBUTING.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,26 @@ To run the documentation locally (requires Node.js):
121121
uv run poe run-docs
122122
```
123123

124+
## Commits
125+
126+
We use [Conventional Commits](https://www.conventionalcommits.org/) format for commit messages. This convention is used to automatically determine version bumps during the release process.
127+
128+
### Available commit types
129+
130+
| Type | Description |
131+
| ---- | ----------- |
132+
| `feat` | A new feature |
133+
| `fix` | A bug fix |
134+
| `docs` | Documentation only changes |
135+
| `style` | Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc) |
136+
| `refactor` | A code change that neither fixes a bug nor adds a feature |
137+
| `perf` | A code change that improves performance |
138+
| `test` | Adding missing tests or correcting existing tests |
139+
| `build` | Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm) |
140+
| `ci` | Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs) |
141+
| `chore` | Other changes that don't modify src or test files |
142+
| `revert` | Reverts a previous commit |
143+
124144
## Release process
125145

126146
Publishing new versions to [PyPI](https://pypi.org/project/apify_client) is automated through GitHub Actions.

website/docusaurus.config.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const path = require('path');
1+
const { join, resolve } = require('node:path');
22

33
const { config } = require('@apify/docs-theme');
44

@@ -102,11 +102,18 @@ module.exports = {
102102
routeBasePath: 'reference',
103103
python: true,
104104
pythonOptions: {
105-
pythonModulePath: path.join(__dirname, '../src/apify_client'),
106-
moduleShortcutsPath: path.join(__dirname, 'module_shortcuts.json'),
105+
pythonModulePath: join(__dirname, '../src/apify_client'),
106+
moduleShortcutsPath: join(__dirname, 'module_shortcuts.json'),
107107
},
108108
},
109109
],
110+
[
111+
resolve(__dirname, 'src/plugins/docusaurus-plugin-segment'),
112+
{
113+
writeKey: process.env.SEGMENT_TOKEN,
114+
allowedInDev: false,
115+
},
116+
],
110117
[
111118
'@signalwire/docusaurus-plugin-llms-txt',
112119
{

0 commit comments

Comments
 (0)