Skip to content

Commit 6a028e5

Browse files
SiaraMistSiaraMist
authored
Merge branch 'main' into updated-env-docs
2 parents 3f79d8c + aa0d9a8 commit 6a028e5

File tree

1,841 files changed

+35589
-20217
lines changed

Some content is hidden

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

1,841 files changed

+35589
-20217
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
// Use 'postCreateCommand' to run commands after the container is created.
5959
"postCreateCommand": "npm ci",
6060

61+
// Use 'updateContentCommand' to run commands to be included in Codespace pre-builds
62+
"updateContentCommand": "git clone https://github.com/github/rest-api-description.git",
63+
6164
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
6265
"remoteUser": "node",
6366

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
creds: ${{ secrets.NONPROD_AZURE_CREDENTIALS }}
8080

8181
- name: 'Docker login'
82-
uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0
82+
uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c
8383
with:
8484
login-server: ${{ secrets.NONPROD_REGISTRY_SERVER }}
8585
username: ${{ env.NONPROD_REGISTRY_USERNAME }}
@@ -206,7 +206,7 @@ jobs:
206206
run: src/workflows/prune-for-preview-env.sh
207207

208208
- name: 'Build and push image'
209-
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
209+
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25
210210
with:
211211
context: .
212212
push: true

‎.github/workflows/azure-prod-build-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
creds: ${{ secrets.PROD_AZURE_CREDENTIALS }}
4343

4444
- name: 'Docker login'
45-
uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0
45+
uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c
4646
with:
4747
login-server: ${{ secrets.PROD_REGISTRY_SERVER }}
4848
username: ${{ secrets.PROD_REGISTRY_USERNAME }}
@@ -90,7 +90,7 @@ jobs:
9090
token: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
9191

9292
- name: 'Build and push image'
93-
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
93+
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25
9494
with:
9595
context: .
9696
push: true

‎.github/workflows/azure-staging-build-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
creds: ${{ secrets.PROD_AZURE_CREDENTIALS }}
5151

5252
- name: 'Docker login'
53-
uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0
53+
uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c
5454
with:
5555
login-server: ${{ secrets.NONPROD_REGISTRY_SERVER }}
5656
username: ${{ secrets.NONPROD_REGISTRY_USERNAME }}
@@ -91,7 +91,7 @@ jobs:
9191
run: src/early-access/scripts/merge-early-access.sh
9292

9393
- name: 'Build and push image'
94-
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
94+
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25
9595
with:
9696
context: .
9797
push: true

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
- main
1111
paths:
1212
- '**/*.js'
13+
- '**/*.ts'
14+
- '**/*.jsx'
15+
- '**/*.tsx'
1316
- '.github/workflows/codeql.yml'
1417
# This is so that when CodeQL runs on a pull request, it can compare
1518
# against the state of the base branch.

‎.github/workflows/comment-release-note-info.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This workflow provides information when a contributor edits a release note file
2+
3+
name: Comment on release note changes
4+
5+
on:
6+
pull_request:
7+
types:
8+
- opened
9+
paths:
10+
- data/release-notes/enterprise-server/**
11+
12+
permissions:
13+
contents: read
14+
pull-requests: write
15+
16+
jobs:
17+
comment:
18+
# Do not add this comment on PRs created by the bot during the standard patch release process
19+
# or in the github/docs repository
20+
if: github.event.pull_request.user.login != 'release-controller[bot]' && github.repository == 'github/docs-internal'
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
24+
with:
25+
issue-number: ${{ github.event.pull_request.number }}
26+
body: |
27+
Thank you for updating our GitHub Enterprise Server release notes. A member of the `docs-content-enterprise` team will review your changes.
28+
29+
- If the change is urgent, post in `#docs-content-enterprise` on Slack.
30+
- Review the [style guide for release notes](https://docs.github.com/en/contributing/style-guide-and-content-model/style-guide#release-notes).
31+
- If you're updating or adding a note, add a datestamp in the format `[Updated: YYYY-MM-DD]`.
32+
- If you're removing a note, add an "[Errata](https://docs.github.com/en/contributing/style-guide-and-content-model/style-guide#errata)" section with details of the change.

‎.github/workflows/generate-code-scanning-query-lists.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ jobs:
106106
GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_READPUBLICKEY }}
107107
DRY_RUN: ${{ github.event_name == 'pull_request'}}
108108
run: |
109+
110+
# When we started, we downloaded the CodeQL CLI here in this workflow.
111+
# We have no intention of checking that in but we also don't want
112+
# `git status ...` to show it as an untracked file.
113+
rm -fr ./codeql
114+
109115
# If nothing to commit, exit now. It's fine. No orphans.
110116
changes=$(git diff --name-only | wc -l)
111117
untracked=$(git status --untracked-files --short | wc -l)

‎.github/workflows/link-check-daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
5353
with:
5454
path: external-link-checker-db.json
55-
key: external-link-checker-${{ hashFiles('src/links/scripts/rendered-content-link-checker.js') }}
55+
key: external-link-checker-${{ hashFiles('src/links/scripts/rendered-content-link-checker.ts') }}
5656

5757
- name: Insight into external link checker DB json file (before)
5858
run: |
@@ -87,7 +87,7 @@ jobs:
8787
EXTERNAL_SERVER_ERRORS_AS_WARNINGS: true
8888
FAIL_ON_FLAW: false
8989
timeout-minutes: 30
90-
run: node src/links/scripts/rendered-content-link-checker.js
90+
run: npm run rendered-content-link-checker
9191

9292
- name: Insight into external link checker DB json file (after)
9393
run: |

‎.github/workflows/link-check-on-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ jobs:
5050
# been loaded.
5151
ENABLED_LANGUAGES: en
5252
FAIL_ON_FLAW: true
53-
run: node src/links/scripts/rendered-content-link-checker.js
53+
run: npm run rendered-content-link-checker

‎.github/workflows/main-preview-docker-cache.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
creds: ${{ secrets.NONPROD_AZURE_CREDENTIALS }}
3636

3737
- name: 'Docker login'
38-
uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0
38+
uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c
3939
with:
4040
login-server: ${{ secrets.NONPROD_REGISTRY_SERVER }}
4141
username: ${{ env.NONPROD_REGISTRY_USERNAME }}
@@ -68,7 +68,7 @@ jobs:
6868
run: src/workflows/prune-for-preview-env.sh
6969

7070
- name: 'Build and push image'
71-
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
71+
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25
7272
with:
7373
context: .
7474
push: true

0 commit comments

Comments
 (0)