Skip to content

Commit 982965f

Browse files
Merge remote-tracking branch 'origin/main' into dev
# Conflicts: # .github/workflows/respec.yaml # .github/workflows/schema-publish.yaml # .github/workflows/schema-tests.yaml # .github/workflows/validate-markdown.yaml # package-lock.json # package.json
2 parents 0bf7686 + a8d13f2 commit 982965f

11 files changed

Lines changed: 2477 additions & 1802 deletions

File tree

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @OAI/arazzo-maintainers

.github/dependabot.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
- package-ecosystem: npm
9+
directory: "/"
10+
schedule:
11+
interval: daily
12+
open-pull-requests-limit: 10
13+
groups:
14+
vitest:
15+
patterns:
16+
- "*vitest*"
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Auto-merge dependabot updates
2+
3+
on:
4+
pull_request:
5+
branches: [ main ]
6+
7+
permissions:
8+
pull-requests: write
9+
contents: write
10+
11+
jobs:
12+
13+
dependabot-merge:
14+
15+
runs-on: ubuntu-latest
16+
17+
if: ${{ github.actor == 'dependabot[bot]' }}
18+
19+
steps:
20+
- name: Dependabot metadata
21+
id: metadata
22+
uses: dependabot/fetch-metadata@v3.1.0
23+
with:
24+
github-token: "${{ secrets.GITHUB_TOKEN }}"
25+
26+
- name: Enable auto-merge for Dependabot PRs
27+
# Only if version bump is not a major version change
28+
if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
29+
run: gh pr merge --auto --merge "$PR_URL"
30+
env:
31+
PR_URL: ${{github.event.pull_request.html_url}}
32+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/respec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
owner: OAI
3030
repositories: spec.openapis.org
3131

32-
- uses: actions/checkout@v6 # checkout main branch of this repo
32+
- uses: actions/checkout@v7 # checkout main branch of this repo
3333
with:
3434
fetch-depth: 0
3535

@@ -40,7 +40,7 @@ jobs:
4040
- name: Install dependencies
4141
run: npm ci
4242

43-
- uses: actions/checkout@v6 # checkout main branch of website repo
43+
- uses: actions/checkout@v7 # checkout main branch of website repo
4444
with:
4545
token: ${{ steps.generate-token.outputs.token }}
4646
repository: OAI/spec.openapis.org

.github/workflows/schema-publish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
owner: OAI
3232
repositories: spec.openapis.org
3333

34-
- uses: actions/checkout@v6 # checkout main branch of this repo
34+
- uses: actions/checkout@v7 # checkout main branch of this repo
3535
with:
3636
fetch-depth: 0
3737

@@ -42,7 +42,7 @@ jobs:
4242
- name: Install dependencies
4343
run: npm ci
4444

45-
- uses: actions/checkout@v6 # checkout main branch of website repo
45+
- uses: actions/checkout@v7 # checkout main branch of website repo
4646
with:
4747
token: ${{ steps.generate-token.outputs.token }}
4848
repository: OAI/spec.openapis.org

.github/workflows/schema-tests.yaml

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

2222
steps:
23-
- uses: actions/checkout@v6 # checkout repo content
23+
- uses: actions/checkout@v7 # checkout repo content
2424
with:
2525
fetch-depth: 0
2626

.github/workflows/validate-markdown.yaml

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

1919
steps:
20-
- uses: actions/checkout@v6 # checkout repo content
20+
- uses: actions/checkout@v7 # checkout repo content
2121
with:
2222
fetch-depth: 0
2323

examples/1.0.0/oauth.arazzo.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ workflows:
6262
successCriteria:
6363
- condition: $statusCode == 200
6464
- context: $response.body
65-
condition: $.access_token != null
65+
condition: $[?@.access_token != null]
6666
type: jsonpath
6767
outputs:
6868
access_token: $response.body#/access_token
@@ -102,7 +102,7 @@ workflows:
102102
successCriteria:
103103
- condition: $statusCode == 200
104104
- context: $response.body
105-
condition: $.access_token != null
105+
condition: $[?@.access_token != null]
106106
type: jsonpath
107107
outputs:
108108
access_token: $response.body#/access_token
@@ -151,9 +151,7 @@ workflows:
151151
value: '12345'
152152
successCriteria:
153153
- condition: $statusCode == 200
154-
- context: $response.body
155-
condition: $.access_token != null
156-
type: jsonpath
154+
- condition: $response.body#/access_token != null
157155
outputs:
158156
code: $response.body#/code # Not really, this is a query parameter
159157

@@ -171,9 +169,7 @@ workflows:
171169
client_secret: $inputs.client_secret
172170
successCriteria:
173171
- condition: $statusCode == 200
174-
- context: $response.body
175-
condition: $.access_token != null
176-
type: jsonpath
172+
- condition: $response.body#/access_token != null
177173
outputs:
178174
access_token: $response.body#/access_token
179175
refresh_token: $response.body#/refresh_token

0 commit comments

Comments
 (0)