Skip to content

Commit b89e673

Browse files
committed
Merge branch 'master' into chore/update-general-resource-access-docs
2 parents 30801e5 + 10da313 commit b89e673

File tree

48 files changed

+632
-719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+632
-719
lines changed

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v5
2121
- name: Use Node.js 22
22-
uses: actions/setup-node@v5
22+
uses: actions/setup-node@v6
2323
with:
2424
node-version: 22
2525
cache: 'npm'

.github/workflows/lychee.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v5
1313

1414
- name: Use Node.js 22
15-
uses: actions/setup-node@v5
15+
uses: actions/setup-node@v6
1616
with:
1717
node-version: 22
1818
cache: 'npm'

.github/workflows/nginx.conf-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
nginx-test-job:
1010
runs-on: ubuntu-latest
1111
container:
12-
image: docker.io/library/nginx:1.29.1-alpine-slim
12+
image: docker.io/library/nginx:1.29.2-alpine-slim
1313
steps:
1414
- name: Checkout repository
1515
uses: actions/checkout@v5

.github/workflows/openapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v5
1616

1717
- name: Use Node.js 22
18-
uses: actions/setup-node@v5
18+
uses: actions/setup-node@v6
1919
with:
2020
node-version: 22
2121
cache: 'npm'

.github/workflows/publish-theme.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fetch-depth: 0
1919

2020
- name: Use Node.js 22
21-
uses: actions/setup-node@v5
21+
uses: actions/setup-node@v6
2222
with:
2323
node-version: 22
2424
cache: 'npm'
@@ -46,7 +46,7 @@ jobs:
4646
token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
4747

4848
- name: Use Node.js 22
49-
uses: actions/setup-node@v5
49+
uses: actions/setup-node@v6
5050
with:
5151
node-version: 22
5252
cache: 'npm'
@@ -98,7 +98,7 @@ jobs:
9898
npm show $PACKAGE_NAME@$PACKAGE_VER # fails if the package is not available, succeeds if it is
9999
100100
- name: Commit the new theme version
101-
uses: stefanzweifel/git-auto-commit-action@v6
101+
uses: stefanzweifel/git-auto-commit-action@v7
102102
with:
103103
commit_message: 'chore: publish new version of @apify/docs-theme [skip ci]'
104104
file_pattern: 'apify-docs-theme/package*.json'

.github/workflows/test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v5
1515

1616
- name: Use Node.js 22
17-
uses: actions/setup-node@v5
17+
uses: actions/setup-node@v6
1818
with:
1919
node-version: 22
2020
cache: 'npm'
@@ -51,7 +51,7 @@ jobs:
5151
separator: ","
5252

5353
- name: Use Node.js 22
54-
uses: actions/setup-node@v5
54+
uses: actions/setup-node@v6
5555
with:
5656
node-version: 22
5757
cache: 'npm'
@@ -84,7 +84,7 @@ jobs:
8484
uses: actions/checkout@v5
8585

8686
- name: Use Node.js 22
87-
uses: actions/setup-node@v5
87+
uses: actions/setup-node@v6
8888
with:
8989
node-version: 22
9090
cache: 'npm'

apify-api/openapi/components/schemas/actor-builds/Build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ properties:
7272
type: string
7373
example: 0.1.1
7474
actorDefinition:
75-
oneOf:
75+
allOf:
7676
- $ref: "../actors/ActorDefinition.yaml"
77-
- type: "null"
77+
nullable: true
7878
example:
7979
id: HG7ML7M8z78YcAPEB
8080
actId: janedoe~my-actor

apify-api/openapi/components/schemas/users/Proxy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ properties:
1010
groups:
1111
type: array
1212
items:
13-
- $ref: ./ProxyGroup.yaml
13+
$ref: ./ProxyGroup.yaml

apify-api/plugins/apify.js

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

apify-api/plugins/apify.mjs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import ClientReferencesLinksDecorator from './decorators/client-references-links-decorator.mjs';
2+
import CodeSamplesDecorator from './decorators/code-samples-decorator.mjs';
3+
import LegacyDocUrlDecorator from './decorators/legacy-doc-url-decorator.mjs';
4+
5+
export default () => ({
6+
id: 'apify',
7+
decorators: {
8+
oas3: {
9+
'legacy-doc-url-decorator': LegacyDocUrlDecorator,
10+
'client-references-links-decorator': ClientReferencesLinksDecorator,
11+
'code-samples-decorator': CodeSamplesDecorator,
12+
},
13+
},
14+
});

0 commit comments

Comments
 (0)