Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/allowed-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = [
"rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9",
"rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e",
"repo-sync/github-sync@3832fe8e2be32372e1b3970bbae8e7079edeec88",
"repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d",
"repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3", // repo-sync/[email protected]
"someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd",
"tjenkinson/gh-action-auto-merge-dependency-updates@4d7756c04d9d999c5968697a621b81c47f533d61",
"EndBug/add-and-commit@9358097a71ad9fb9e2f9624c6098c89193d83575",
Expand Down
18 changes: 17 additions & 1 deletion .github/workflows/repo-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- name: Create pull request
id: create-pull
uses: repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d
uses: repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3
env:
GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
with:
Expand All @@ -52,6 +52,22 @@ jobs:
base: main
author: Octomerger

# Sometimes the `repo-sync` branch gets created but GitHub thinks a pull
# request is already attached to the branch. This may happen when an
# external contributor creates a pull request for the `repo-sync` branch
# in a fork, then deletes their repository. If there were changes added
# to the `repo-sync` branch but no pull request can be found, we should
# fail. The failure will then be sent to Slack in the last step.
- name: Check for pull request creation errors
if: ${{ !steps.find-pull-request.outputs.number }}
id: check-pr-creation
run: |
LINES_CHANGED=$(git diff --name-only "main" "repo-sync" -- | wc -l | awk '{print $1}')
if [[ "$LINES_CHANGED" != "0" ]]; then
echo 'Unable to create a new PR for the existing branch `repo-sync`. Delete that branch and re-run this workflow to generate a new PR.'
exit 1 # prevents further steps from running
fi

- name: Approve pull request
if: ${{ steps.find-pull-request.outputs.number }}
uses: juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8
Expand Down
1,580 changes: 1,537 additions & 43 deletions lib/rest/static/decorated/api.github.com.json

Large diffs are not rendered by default.

24 changes: 16 additions & 8 deletions lib/rest/static/decorated/ghes-2.22.json
Original file line number Diff line number Diff line change
Expand Up @@ -28669,12 +28669,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -28748,12 +28749,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -28826,12 +28828,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
},
{
"name": "per_page",
Expand Down Expand Up @@ -28925,12 +28928,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -29003,12 +29007,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
},
{
"name": "filter",
Expand Down Expand Up @@ -29117,12 +29122,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -29195,12 +29201,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -29273,12 +29280,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down
24 changes: 16 additions & 8 deletions lib/rest/static/decorated/ghes-3.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -33009,12 +33009,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -33088,12 +33089,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -33166,12 +33168,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
},
{
"name": "per_page",
Expand Down Expand Up @@ -33265,12 +33268,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -33343,12 +33347,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
},
{
"name": "filter",
Expand Down Expand Up @@ -33457,12 +33462,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -33535,12 +33541,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down Expand Up @@ -33613,12 +33620,13 @@
},
{
"name": "run_id",
"description": "The id of the workflow run",
"in": "path",
"required": true,
"schema": {
"type": "integer"
},
"descriptionHTML": ""
"descriptionHTML": "<p>The id of the workflow run</p>"
}
],
"x-codeSamples": [
Expand Down
Loading