Skip to content

Commit 9353554

Browse files
authored
Merge branch 'master' into feat/chatgpt
2 parents 9b56256 + 336cec3 commit 9353554

File tree

350 files changed

+8468
-4281
lines changed

Some content is hidden

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

350 files changed

+8468
-4281
lines changed

.github/styles/config/vocabularies/Docs/accept.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ idempotency
4545
backoff
4646

4747
Authy
48-
reCaptcha
48+
reCAPTCHA?
4949
OAuth
5050
untrusted
5151
unencrypted
@@ -118,7 +118,7 @@ SKUs?
118118
subreddits?
119119
[Ss]ubwoofer
120120
Tripadvisor
121-
upvote
121+
[Uu]pvote
122122
[Ww]alkthroughs?
123123

124124
ul

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- name: Use Node.js 22
2222
uses: actions/setup-node@v6
2323
with:
24-
node-version: 22
24+
node-version: 24
2525
cache: 'npm'
2626
cache-dependency-path: 'package-lock.json'
2727
always-auth: 'true'

.github/workflows/lychee.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
link-check:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313

1414
- name: Use Node.js 22
1515
uses: actions/setup-node@v6
1616
with:
17-
node-version: 22
17+
node-version: 24
1818
cache: 'npm'
1919
cache-dependency-path: 'package-lock.json'
2020
always-auth: 'true'
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Run Lychee Link Checker
3737
id: lychee
38-
uses: lycheeverse/lychee-action@v2.6.1
38+
uses: lycheeverse/lychee-action@v2.7.0
3939
env:
4040
GITHUB_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
4141
with:

.github/workflows/openapi.yaml

Lines changed: 65 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,74 @@ name: Check OpenAPI specs
33
on:
44
push:
55

6-
#env:
7-
# APIFY_STAGING_TOKEN: ${{ secrets.APIFY_STAGING_TOKEN }}
8-
96
jobs:
107
build:
118
name: Build the specification file
129
runs-on: ubuntu-latest
1310

1411
steps:
15-
- uses: actions/checkout@v5
16-
17-
- name: Use Node.js 22
18-
uses: actions/setup-node@v6
19-
with:
20-
node-version: 22
21-
cache: 'npm'
22-
cache-dependency-path: 'package-lock.json'
23-
24-
- name: Enable corepack
25-
run: |
26-
corepack enable
27-
28-
- name: Install Dependencies
29-
run: npm ci --force
30-
env:
31-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
32-
33-
- run: |
34-
npm ci
35-
npm run redoc:test
36-
37-
# TODO
38-
# - uses: actions/setup-python@v5
39-
# with:
40-
# python-version: '3.10'
41-
# - run: python -m pip install schemathesis==3.35.0
12+
- uses: actions/checkout@v6
13+
14+
- name: Use Node.js 24
15+
uses: actions/setup-node@v6
16+
with:
17+
node-version: 24
18+
cache: "npm"
19+
cache-dependency-path: "package-lock.json"
20+
21+
- name: Enable corepack
22+
run: |
23+
corepack enable
24+
25+
- name: Install Dependencies
26+
run: npm ci --force
27+
env:
28+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
29+
30+
- run: |
31+
npm run redoc:test
32+
33+
validate-go-codegen:
34+
name: Validate Go client generation
35+
runs-on: ubuntu-latest
36+
37+
steps:
38+
- uses: actions/checkout@v6
39+
40+
- name: Use Node.js 24
41+
uses: actions/setup-node@v6
42+
with:
43+
node-version: 24
44+
cache: "npm"
45+
cache-dependency-path: "package-lock.json"
46+
47+
- name: Enable corepack
48+
run: |
49+
corepack enable
50+
51+
- name: Install Dependencies
52+
run: npm ci --force
53+
54+
- name: Build OpenAPI spec
55+
run: npm run redoc:build:clean:yaml
56+
57+
- name: Setup Go
58+
uses: actions/setup-go@v6
59+
with:
60+
go-version: "1.25"
61+
# Disable caching since go.sum is gitignored and regenerated on each run.
62+
cache: false
63+
64+
- name: Install oapi-codegen as tool
65+
working-directory: codegen/oapi-codegen-go
66+
run: go get -tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest
67+
68+
- name: Generate Go client
69+
working-directory: codegen/oapi-codegen-go
70+
run: go tool oapi-codegen -config oapi-codegen.yaml ../../static/api/openapi.yaml
71+
72+
- name: Build generated client
73+
working-directory: codegen/oapi-codegen-go
74+
run: |
75+
go mod tidy
76+
go build ./...

.github/workflows/publish-theme.yaml renamed to .github/workflows/publish-to-npm.yaml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,25 @@ on:
66
- master
77
workflow_dispatch:
88

9+
permissions:
10+
id-token: write
11+
contents: write
12+
913
jobs:
1014
look_for_change:
1115
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
1216
runs-on: ubuntu-latest
1317
outputs:
1418
theme_changed: ${{ steps.changed-theme-files.outputs.any_changed }}
1519
steps:
16-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
1721
with:
1822
fetch-depth: 0
1923

20-
- name: Use Node.js 22
24+
- name: Use Node.js
2125
uses: actions/setup-node@v6
2226
with:
23-
node-version: 22
27+
node-version: 24
2428
cache: 'npm'
2529
cache-dependency-path: 'package-lock.json'
2630

@@ -41,15 +45,16 @@ jobs:
4145
if: ${{ needs.look_for_change.outputs.theme_changed == 'true' || github.event_name == 'workflow_dispatch' }}
4246
runs-on: ubuntu-latest
4347
steps:
44-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4549
with:
4650
token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
4751

48-
- name: Use Node.js 22
52+
- name: Use Node.js
4953
uses: actions/setup-node@v6
5054
with:
51-
node-version: 22
55+
node-version: 24
5256
cache: 'npm'
57+
registry-url: 'https://registry.npmjs.org'
5358
cache-dependency-path: 'package-lock.json'
5459
always-auth: 'true'
5560

@@ -62,9 +67,6 @@ jobs:
6267
git config --global user.name "Apify Release Bot"
6368
git config --global user.email "[email protected]"
6469
65-
echo "access=public" > ~/.npmrc
66-
echo "//registry.npmjs.org/:_authToken=${{ secrets.APIFY_SERVICE_ACCOUNT_NPM_TOKEN }}" >> ~/.npmrc
67-
6870
- name: Bump the theme version
6971
run: |
7072
cd $GITHUB_WORKSPACE/apify-docs-theme
@@ -73,10 +75,7 @@ jobs:
7375
- name: Deploy theme to npm
7476
run: |
7577
cd $GITHUB_WORKSPACE/apify-docs-theme
76-
npx -y publish-if-not-exists
77-
env:
78-
GIT_USER: "barjin:${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}"
79-
GH_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
78+
npm publish
8079
8180
- name: Wait until the new theme version is available on npm
8281
run: |

.github/workflows/test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout Source code
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- name: Use Node.js 22
1717
uses: actions/setup-node@v6
1818
with:
19-
node-version: 22
19+
node-version: 24
2020
cache: 'npm'
2121
cache-dependency-path: 'package-lock.json'
2222
always-auth: 'true'
@@ -144,7 +144,7 @@ jobs:
144144
runs-on: ubuntu-latest
145145
steps:
146146
- name: Checkout Source code
147-
uses: actions/checkout@v5
147+
uses: actions/checkout@v6
148148

149149
- name: Get changed files
150150
id: changed-files
@@ -157,7 +157,7 @@ jobs:
157157
- name: Use Node.js 22
158158
uses: actions/setup-node@v6
159159
with:
160-
node-version: 22
160+
node-version: 24
161161
cache: 'npm'
162162
cache-dependency-path: 'package-lock.json'
163163

@@ -185,12 +185,12 @@ jobs:
185185
runs-on: ubuntu-latest
186186
steps:
187187
- name: Checkout Source code
188-
uses: actions/checkout@v5
188+
uses: actions/checkout@v6
189189

190190
- name: Use Node.js 22
191191
uses: actions/setup-node@v6
192192
with:
193-
node-version: 22
193+
node-version: 24
194194
cache: 'npm'
195195
cache-dependency-path: 'package-lock.json'
196196

.github/workflows/vale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v5
10+
- uses: actions/checkout@v6
1111
with:
1212
fetch-depth: 0
1313

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@ sources/api/*
2424
apify-api.yaml
2525
static/api
2626
apify-docs-theme/package-lock.json
27+
codegen/*/generated/
28+
codegen/*/go.sum
2729
.github/styles/Microsoft
2830
.github/styles/write-good

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22
1+
24

.vale.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Microsoft.Foreign = NO
2626
Microsoft.We = NO
2727
Microsoft.Quotes = NO
2828
Microsoft.Auto = NO
29+
Microsoft.Units = NO
2930
Microsoft.URLFormat = NO
3031
Microsoft.GeneralURL = NO
3132

0 commit comments

Comments
 (0)