Skip to content

Commit 48fbea1

Browse files
committed
Merge branch 'master' into feat/add-output-schema
2 parents 20bb100 + f7000af commit 48fbea1

File tree

67 files changed

+1212
-1182
lines changed

Some content is hidden

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

67 files changed

+1212
-1182
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: 0 additions & 24 deletions
This file was deleted.

.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: 63 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'
@@ -35,6 +35,66 @@ jobs:
3535
INTERCOM_APP_ID: ${{ secrets.INTERCOM_APP_ID }}
3636
SEGMENT_TOKEN: ${{ secrets.SEGMENT_TOKEN }}
3737

38+
# - name: Install Nginx
39+
# run: |
40+
# sudo apt-get update
41+
# sudo apt-get install -y nginx
42+
#
43+
# - name: Start Docusaurus server
44+
# run: |
45+
# nohup npx docusaurus serve --port 3000 --no-open &
46+
# sleep 5
47+
# curl -f http://localhost:3000 > /dev/null
48+
#
49+
# - name: Start Nginx with project config
50+
# run: |
51+
# cat > default.conf <<EOF
52+
# worker_processes auto;
53+
# error_log $(pwd)/logs/error.log;
54+
# pid $(pwd)/logs/nginx.pid;
55+
# events {}
56+
# http {
57+
# access_log $(pwd)/logs/access.log;
58+
# include $(pwd)/nginx.conf;
59+
# }
60+
# EOF
61+
# sed -i 's|https://apify.github.io/apify-docs|http://localhost:3000|g' default.conf
62+
# mkdir -p $(pwd)/logs
63+
# nginx -c $(pwd)/default.conf
64+
# sleep 1
65+
#
66+
# - name: Run header assertions
67+
# run: |
68+
# set -euo pipefail
69+
# function assert_header() {
70+
# url=$1
71+
# header=$2
72+
# expected=$3
73+
# shift 3
74+
# extra_args=("$@")
75+
# actual=$(curl -s -D - -o /dev/null "${extra_args[@]}" "$url" | grep -i "^$header" | tr -d '\r' || true)
76+
# echo "→ $url → $actual"
77+
# echo "$actual" | grep -q "$expected" || (echo "❌ Expected '$expected' in '$header' for $url" && exit 1)
78+
# }
79+
#
80+
# echo "🧪 Checking Nginx responses..."
81+
#
82+
# assert_header "http://localhost:8080/" "Content-Type" "text/html"
83+
# assert_header "http://localhost:8080/" "Content-Type" "text/markdown" -H "Accept: text/markdown"
84+
# assert_header "http://localhost:8080/platform/proxy/usage" "Content-Type" "text/html"
85+
# assert_header "http://localhost:8080/platform/proxy/usage.md" "Content-Type" "text/markdown"
86+
# assert_header "http://localhost:8080/platform/proxy/usage" "Content-Type" "text/markdown" -H "Accept: text/markdown"
87+
# assert_header "http://localhost:8080/img/docs-og.png" "Content-Type" "image/png"
88+
# assert_header "http://localhost:8080/img/javascript-40x40.svg" "Content-Type" "image/svg"
89+
# assert_header "http://localhost:8080/llms.txt" "Content-Type" "text/markdown"
90+
# assert_header "http://localhost:8080/llms-full.txt" "Content-Type" "text/markdown"
91+
#
92+
# echo "✅ All Nginx header checks passed."
93+
#
94+
# - name: Stop Nginx
95+
# if: always()
96+
# run: nginx -c $(pwd)/default.conf -s stop
97+
3898
lint_content:
3999
name: Lint markdown content
40100
runs-on: ubuntu-latest
@@ -51,7 +111,7 @@ jobs:
51111
separator: ","
52112

53113
- name: Use Node.js 22
54-
uses: actions/setup-node@v5
114+
uses: actions/setup-node@v6
55115
with:
56116
node-version: 22
57117
cache: 'npm'
@@ -84,7 +144,7 @@ jobs:
84144
uses: actions/checkout@v5
85145

86146
- name: Use Node.js 22
87-
uses: actions/setup-node@v5
147+
uses: actions/setup-node@v6
88148
with:
89149
node-version: 22
90150
cache: 'npm'

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ This will be enough to work on Platform, Academy and OpenAPI. If you want to wor
7070
5. Add a record to `/etc/hosts`, which maps the `docs.apify.loc` to a localhost:
7171
7272
```text
73-
127.0.01 docs.apify.loc
73+
127.0.0.1 docs.apify.loc
7474
```
7575
7676
You should be able to open https://docs.apify.loc in your browser and run all the repositories jointly as one project.

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.

0 commit comments

Comments
 (0)