Skip to content

Commit

Permalink
Merge pull request #35530 from github/repo-sync
Browse files Browse the repository at this point in the history
Repo sync
  • Loading branch information
docs-bot authored Dec 3, 2024
2 parents 3ba7c30 + f238c09 commit 5fa2506
Show file tree
Hide file tree
Showing 14 changed files with 1,718 additions and 58 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/reviewers-dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Add Dependabot Core Maintainers as Reviewers

# **What it does**: Automatically add reviewers based on paths, for docs-internal and docs repos.
# **Why we have it**: So dependabot maintainers can be notified about relevant pull requests.
# **Who does it impact**: dependabot-updates-reviewers.

on:
pull_request:
paths:
- 'data/reusable/dependabot/**'
- 'content/code-security/dependabot/**'
- 'content/rest/dependabot/**'

jobs:
add-reviewer:
if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
runs-on: ubuntu-latest
steps:
- name: Check out repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Add Dependabot Core Maintainers as reviewers
env:
GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_WRITEORG_PROJECT }}
PR: ${{ github.event.pull_request.html_url }}
run: |
has_reviewer=$(
gh pr view $PR --json reviews |
jq 'any(.reviews[]; select(length > 0))'
)
if ! $has_reviewer
then
gh pr edit $PR --add-reviewer github/dependabot-updates-reviewers
fi
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ To use the action place this snippet under your `jobs` in the desired workflow.

```yaml
- name: Configure GitHub Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
```
This action helps support deployment from any static site generator to {% data variables.product.prodname_pages %}. To make this process less repetitive you can use workflow templates for some of the most widely used static site generators. For more information, see "[AUTOTITLE](/actions/learn-github-actions/using-starter-workflows)."
Expand All @@ -36,7 +36,13 @@ To use the action in your current workflow place this snippet under `jobs`.

```yaml
- name: Upload GitHub Pages artifact
{%- ifversion fpt or ghec %}
uses: actions/upload-pages-artifact@v3
{%- elsif pages-custom-workflow-ghes3-9 %}
uses: actions/upload-pages-artifact@v2
{%- else %}
uses: actions/upload-pages-artifact@v1
{%- endif %}
```

## Deploying {% data variables.product.prodname_pages %} artifacts
Expand All @@ -50,8 +56,6 @@ The `deploy-pages` action handles the necessary setup for deploying artifacts. T

For more information, see the [`deploy-pages`](https://github.com/marketplace/actions/deploy-github-pages-site) action.

{% raw %}

```yaml
# ...
Expand All @@ -65,16 +69,20 @@ jobs:
needs: jekyll-build
environment:
name: github-pages
url: ${{steps.deployment.outputs.page_url}}
url: {% raw %}${{steps.deployment.outputs.page_url}}{% endraw %}
steps:
- name: Deploy artifact
id: deployment
{%- ifversion fpt or ghec %}
uses: actions/deploy-pages@v4
{%- elsif pages-custom-workflow-ghes3-9 %}
uses: actions/deploy-pages@v3
{%- else %}
uses: actions/deploy-pages@v1
{%- endif %}
# ...
```

{% endraw %}

## Linking separate build and deploy jobs

You can link your `build` and `deploy` jobs in a single workflow file, eliminating the need to create two separate files to get the same result. To get started on your workflow file, under `jobs` you can define a `build` and `deploy` job to execute your jobs.
Expand All @@ -91,14 +99,20 @@ jobs:
uses: {% data reusables.actions.action-checkout %}
- name: Setup Pages
id: pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
with:
source: ./
destination: ./_site
- name: Upload artifact
{%- ifversion fpt or ghec %}
uses: actions/upload-pages-artifact@v3
{%- elsif pages-custom-workflow-ghes3-9 %}
uses: actions/upload-pages-artifact@v2
{%- else %}
uses: actions/upload-pages-artifact@v1
{%- endif %}
# Deployment job
deploy:
Expand All @@ -110,7 +124,13 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
{%- ifversion fpt or ghec %}
uses: actions/deploy-pages@v4
{%- elsif pages-custom-workflow-ghes3-9 %}
uses: actions/deploy-pages@v3
{%- else %}
uses: actions/deploy-pages@v1
{%- endif %}
# ...
```

Expand All @@ -130,15 +150,27 @@ jobs:
- name: Checkout
uses: {% data reusables.actions.action-checkout %}
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Upload Artifact
{%- ifversion fpt or ghec %}
uses: actions/upload-pages-artifact@v3
{%- elsif pages-custom-workflow-ghes3-9 %}
uses: actions/upload-pages-artifact@v2
{%- else %}
uses: actions/upload-pages-artifact@v1
{%- endif %}
with:
# upload entire directory
path: '.'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
{%- ifversion fpt or ghec %}
uses: actions/deploy-pages@v4
{%- elsif pages-custom-workflow-ghes3-9 %}
uses: actions/deploy-pages@v3
{%- else %}
uses: actions/deploy-pages@v1
{%- endif %}
# ...
```
Expand Down
3 changes: 0 additions & 3 deletions data/features/enforce-security-configurations-beta.yml

This file was deleted.

5 changes: 0 additions & 5 deletions data/features/enforce-security-configurations.yml

This file was deleted.

6 changes: 0 additions & 6 deletions data/features/ghas-for-azure-devops.yml

This file was deleted.

5 changes: 0 additions & 5 deletions data/features/github-models-cli.yml

This file was deleted.

5 changes: 5 additions & 0 deletions data/features/pages-custom-workflow-ghes3-9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Issue 5102 for the GHES release
# Publishing Pages via custom Actions workflow in GHES >= 3.9
# https://github.com/actions/deploy-pages?tab=readme-ov-file#compatibility
versions:
ghes: '>=3.9'

This file was deleted.

2 changes: 1 addition & 1 deletion src/audit-logs/lib/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
"apiRequestEvent": "This event is only available via audit log streaming."
},
"sha": "ef080778a1c60b08685a0c0ecda03fe301de67fc"
"sha": "747e4cd3acd3a1e7ee9d7f122264cef706eaadee"
}
40 changes: 40 additions & 0 deletions src/graphql/data/fpt/changelog.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,44 @@
[
{
"schemaChanges": [
{
"title": "The GraphQL schema includes these changes:",
"changes": [
"<p>Type <code>AddSubIssueInput</code> was added</p>",
"<p>Type <code>AddSubIssuePayload</code> was added</p>",
"<p>Type <code>AnnouncementBannerI</code> was added</p>",
"<p>Type <code>RemoveSubIssueInput</code> was added</p>",
"<p>Type <code>RemoveSubIssuePayload</code> was added</p>",
"<p>Type <code>ReprioritizeSubIssueInput</code> was added</p>",
"<p>Type <code>ReprioritizeSubIssuePayload</code> was added</p>",
"<p>Type <code>SubIssuesSummary</code> was added</p>",
"<p>Type <code>AnnouncementBanner</code> was removed</p>",
"<p>Input field <code>parentIssueId</code> of type <code>ID</code> was added to input object type <code>CreateIssueInput</code></p>",
"<p>Field <code>enabled</code> was added to object type <code>DeployKey</code></p>",
"<p><code>Enterprise</code> object implements <code>AnnouncementBannerI</code> interface</p>",
"<p><code>Enterprise</code> object type no longer implements <code>AnnouncementBanner</code> interface</p>",
"<p>Field <code>repositoryDeployKeySetting</code> was added to object type <code>EnterpriseOwnerInfo</code></p>",
"<p>Field <code>repositoryDeployKeySettingOrganizations</code> was added to object type <code>EnterpriseOwnerInfo</code></p>",
"<p>Field <code>verifiedAt</code> was added to interface <code>GitSignature</code></p>",
"<p>Field <code>verifiedAt</code> was added to object type <code>GpgSignature</code></p>",
"<p>Field <code>parent</code> was added to object type <code>Issue</code></p>",
"<p>Field <code>subIssues</code> was added to object type <code>Issue</code></p>",
"<p>Field <code>subIssuesSummary</code> was added to object type <code>Issue</code></p>",
"<p>Field <code>addSubIssue</code> was added to object type <code>Mutation</code></p>",
"<p>Field <code>removeSubIssue</code> was added to object type <code>Mutation</code></p>",
"<p>Field <code>reprioritizeSubIssue</code> was added to object type <code>Mutation</code></p>",
"<p><code>Organization</code> object implements <code>AnnouncementBannerI</code> interface</p>",
"<p><code>Organization</code> object type no longer implements <code>AnnouncementBanner</code> interface</p>",
"<p>Field <code>verifiedAt</code> was added to object type <code>SmimeSignature</code></p>",
"<p>Field <code>verifiedAt</code> was added to object type <code>SshSignature</code></p>",
"<p>Field <code>verifiedAt</code> was added to object type <code>UnknownSignature</code></p>"
]
}
],
"previewChanges": [],
"upcomingChanges": [],
"date": "2024-12-02"
},
{
"schemaChanges": [
{
Expand Down
Loading

0 comments on commit 5fa2506

Please sign in to comment.