Skip to content

Commit 09a6026

Browse files
Merge pull request #4837 from OAI/dev
v3.1-dev: update from dev
2 parents 786284f + 1f3374c commit 09a6026

File tree

11 files changed

+440
-325
lines changed

11 files changed

+440
-325
lines changed

.github/workflows/sync-dev-to-vX.Y-dev.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ jobs:
4242
continue
4343
fi
4444
45-
gh pr create --base $BASE --head $HEAD \
45+
PR=$(gh pr create --base $BASE --head $HEAD \
4646
--label "Housekeeping" \
4747
--title "$BASE: update from $HEAD" \
48-
--body "Merge \`$HEAD\` into \`$BASE\`."
48+
--body "Merge \`$HEAD\` into \`$BASE\`.")
49+
gh pr merge $PR --merge --admin
4950
done
5051
env:
5152
GH_TOKEN: ${{ steps.generate-token.outputs.token }}

MAINTAINERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
## Active
44

5-
* Darrel Miller [@darrelmiller](https://github.com/darrelmiller)
65
* Jeremy Whitlock [@whitlockjc](https://github.com/whitlockjc)
76
* Marsh Gardiner [@earth2marsh](https://github.com/earth2marsh)
87
* Ron Ratovsky [@webron](https://github.com/webron)
@@ -13,6 +12,7 @@
1312

1413
## Emeritus
1514

15+
* Darrel Miller [@darrelmiller](https://github.com/darrelmiller)
1616
* Mike Ralphson [@MikeRalphson](https://github.com/MikeRalphson)
1717
* Uri Sarid [@usarid](https://github.com/usarid)
1818
* Jason Harmon [@jharmn](https://github.com/jharmn)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This GitHub project is the starting point for OpenAPI. Here you will find the in
1717

1818
## Versions
1919

20-
This repository contains [the Markdown sources](versions) for [all published OpenAPI Specification versions](https://spec.openapis.org/). For release notes and release candidate versions, refer to the [releases page](releases).
20+
This repository contains [the Markdown sources](versions) for [all published OpenAPI Specification versions](https://spec.openapis.org/). For release notes and release candidate versions, refer to the [releases page](https://github.com/OAI/OpenAPI-Specification/releases).
2121

2222
## See It in Action
2323

0 commit comments

Comments
 (0)