Skip to content

Commit c29fa45

Browse files
authored
Merge branch 'main' into patch-3
2 parents bf206d5 + dc7fcd8 commit c29fa45

File tree

837 files changed

+228337
-671724
lines changed

Some content is hidden

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

837 files changed

+228337
-671724
lines changed

.github/actions-scripts/enterprise-server-issue-templates/deprecation-issue.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,5 @@ In your `docs-internal` checkout:
7878
- [ ] In `github/github`, edit the release's config file in `app/api/description/config/releases/`, and change `deprecated: false` to `deprecated: true`.
7979
- [ ] Open a new PR, and get the required code owner approvals. A docs-content team member can approve it for the docs team.
8080
- [ ] When the PR is approved, [deploy the `github/github` PR](https://thehub.github.com/engineering/devops/deployment/deploying-dotcom/). If you haven't deployed a `github/github` PR before, work with someone that has -- the process isn't too involved depending on how you deploy, but there are a lot of details that can potentially be confusing as you can see from the documentation.
81+
82+
**Note**: you can do this step independently of the other steps after a GHES version is deprecated since it should no longer get updates in github/github. You should plan to get this PR merged as soon as possible, otherwise if you wait too long our OpenAPI automation may re-add the static files that you removed in step 5.

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,3 @@ updates:
2626
schedule:
2727
interval: weekly
2828
day: thursday
29-
ignore:
30-
- dependency-name: '*'
31-
update-types:
32-
['version-update:semver-patch', 'version-update:semver-minor']

.github/workflows/azure-preview-env-deploy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ on:
2727
description: 'The commit SHA to build'
2828
type: string
2929
required: true
30+
push:
31+
branches:
32+
- gh-readonly-queue/main/**
3033

3134
permissions:
3235
contents: read
@@ -50,7 +53,7 @@ jobs:
5053
# to link a PR to a list of environments later.
5154
url: ${{ env.APP_URL }}
5255
env:
53-
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER }}
56+
PR_NUMBER: ${{ github.event.number || github.event.inputs.PR_NUMBER || github.run_id }}
5457
COMMIT_REF: ${{ github.event.pull_request.head.sha || github.event.inputs.COMMIT_REF }}
5558
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
5659
IS_INTERNAL_BUILD: ${{ github.repository == 'github/docs-internal' }}

.github/workflows/azure-preview-env-destroy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
# This will fail if the IMAGE_REPO doesn't exist, but we don't care
6262
- name: 'Untag all docker images for this PR'
6363
run: |
64-
az acr repository delete -n ${{ secrets.NONPROD_REGISTRY_NAME }} --repository ${{ env.IMAGE_REPO }} -y || true
64+
az acr repository delete -n ${{ secrets.NONPROD_REGISTRY_SERVER }} --repository ${{ env.IMAGE_REPO }} -y || true
6565
6666
# Remove all GitHub deployments from this environment and remove the environment
6767
- uses: strumwolf/delete-deployment-environment@45c821e46baa405e25410700fe2e9643929706a0

.github/workflows/link-check-all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
push:
1010
branches:
1111
- main
12+
- gh-readonly-queue/main/**
1213
pull_request:
1314

1415
permissions:

.github/workflows/openapi-decorate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: EndBug/add-and-commit@756d9ea820f11931e591eaf57f25e0f5b903d5b2
5858
with:
5959
# The arguments for the `git add` command
60-
add: 'lib/rest/static/decorated'
60+
add: '["lib/rest/static/apps", "lib/rest/static/decorated"]'
6161

6262
# The message for the commit
6363
message: 'Add decorated OpenAPI schema files'

.github/workflows/orphaned-assets-check.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ name: 'Orphaned assets check'
66

77
on:
88
pull_request:
9+
push:
10+
branches:
11+
- gh-readonly-queue/main/**
912

1013
permissions:
1114
contents: read

.github/workflows/repo-freeze-check.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
- unlocked
1616
branches:
1717
- main
18+
push:
19+
branches:
20+
- gh-readonly-queue/main/**
1821

1922
permissions:
2023
contents: none

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ name: Node.js Tests
77
on:
88
workflow_dispatch:
99
pull_request:
10+
push:
11+
branches:
12+
- gh-readonly-queue/main/**
1013

1114
permissions:
1215
contents: read

.github/workflows/triage-unallowed-internal-changes.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
- opened
1313
- reopened
1414
- synchronize
15+
push:
16+
branches:
17+
- gh-readonly-queue/main/**
1518

1619
permissions:
1720
# This is needed by dorny/paths-filter
@@ -36,7 +39,7 @@ jobs:
3639
id: filter
3740
with:
3841
# Base branch used to get changed files
39-
base: ${{ github.event.pull_request.base.ref }}
42+
base: ${{ github.event.pull_request.base.ref || github.base_ref || github.ref }}
4043

4144
# Enables setting an output in the format in `${FILTER_NAME}_files
4245
# with the names of the matching files formatted as JSON array

0 commit comments

Comments
 (0)