Skip to content

Commit 734ed76

Browse files
authored
Merge branch 'main' into action_status-context
2 parents 5ef12e6 + d5ffd37 commit 734ed76

File tree

106 files changed

+1991
-912
lines changed

Some content is hidden

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

106 files changed

+1991
-912
lines changed

.github/workflows/60-days-stale-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/stale@7fb802b3079a276cf3c7e6ba9aa003c665b3f838
20+
- uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity.'

.github/workflows/triage-stale-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/stale@7fb802b3079a276cf3c7e6ba9aa003c665b3f838
21+
- uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
2424
stale-issue-message: 'A stale label has been added to this issue becuase it has been open for 60 days with no activity. To keep this issue open, add a comment within 3 days.'
@@ -34,7 +34,7 @@ jobs:
3434
if: github.repository == 'github/docs'
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/stale@7fb802b3079a276cf3c7e6ba9aa003c665b3f838
37+
- uses: actions/stale@3cc123766321e9f15a6676375c154ccffb12a358
3838
with:
3939
repo-token: ${{ secrets.GITHUB_TOKEN }}
4040
stale-pr-message: 'This is a gentle bump for the docs team that this PR is waiting for review.'

components/article/PlatformPicker.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,16 @@ export const PlatformPicker = ({ variant = 'subnav' }: Props) => {
137137
data-platform={option.id}
138138
as="button"
139139
selected={option.id === currentPlatform}
140+
// Temporary fix: This should be removed when this merges: PR 24123
141+
sx={{
142+
color: 'var(--color-fg-default)',
143+
'&.selected': { color: 'var(--color-fg-default)' },
144+
':hover': { color: 'var(--color-fg-default)' },
145+
':focus': {
146+
color: 'var(--color-fg-default)',
147+
outline: '-webkit-focus-ring-color auto 1px;',
148+
},
149+
}}
140150
onClick={() => {
141151
onClickPlatform(option.id)
142152
}}

components/article/ToolPicker.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,16 @@ export const ToolPicker = ({ variant = 'subnav' }: Props) => {
117117
data-tool={tool}
118118
as="button"
119119
selected={tool === currentTool}
120+
// Temporary fix: This should be removed when this merges: PR 24123
121+
sx={{
122+
color: 'var(--color-fg-default)',
123+
'&.selected': { color: 'var(--color-fg-default)' },
124+
':hover': { color: 'var(--color-fg-default)' },
125+
':focus': {
126+
color: 'var(--color-fg-default)',
127+
outline: '-webkit-focus-ring-color auto 1px;',
128+
},
129+
}}
120130
onClick={() => {
121131
onClickTool(tool)
122132
}}

components/rest/PreviewsRow.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ type Props = {
99

1010
export function PreviewsRow({ slug, hasRequiredPreviews, xGitHub }: Props) {
1111
const { t } = useTranslation('products')
12+
const hasPreviews = xGitHub.previews && xGitHub.previews.length > 0
1213

1314
return (
1415
<tr>
@@ -24,7 +25,7 @@ export function PreviewsRow({ slug, hasRequiredPreviews, xGitHub }: Props) {
2425
<p className="m-0">
2526
Setting to
2627
<code>application/vnd.github.v3+json</code> is recommended.
27-
{xGitHub.previews && (
28+
{hasPreviews && (
2829
<a href={`#${slug}-preview-notices`} className="d-inline">
2930
{xGitHub.previews.length > 1
3031
? ` ${t('rest.reference.see_preview_notices')}`

components/rest/RestPreviewNotice.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export function RestPreviewNotice({ slug, previews }: Props) {
2121
)
2222
})
2323

24-
return (
24+
return previews.length > 0 ? (
2525
<>
2626
<h4 id={`${slug}-preview-notices`}>
2727
{previews.length > 1
@@ -30,5 +30,5 @@ export function RestPreviewNotice({ slug, previews }: Props) {
3030
</h4>
3131
{previewNotices}
3232
</>
33-
)
33+
) : null
3434
}

content/actions/learn-github-actions/expressions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ jobs:
252252

253253
`hashFiles(path)`
254254

255-
Returns a single hash for the set of files that matches the `path` pattern. You can provide a single `path` pattern or multiple `path` patterns separated by commas. The `path` is relative to the `GITHUB_WORKSPACE` directory and can only include files inside of the `GITHUB_WORKSPACE`. This function calculates an individual SHA-256 hash for each matched file, and then uses those hashes to calculate a final SHA-256 hash for the set of files. For more information about SHA-256, see "[SHA-2](https://en.wikipedia.org/wiki/SHA-2)."
255+
Returns a single hash for the set of files that matches the `path` pattern. You can provide a single `path` pattern or multiple `path` patterns separated by commas. The `path` is relative to the `GITHUB_WORKSPACE` directory and can only include files inside of the `GITHUB_WORKSPACE`. This function calculates an individual SHA-256 hash for each matched file, and then uses those hashes to calculate a final SHA-256 hash for the set of files. If the `path` pattern does not match any files, this returns an empty string. For more information about SHA-256, see "[SHA-2](https://en.wikipedia.org/wiki/SHA-2)."
256256

257257
You can use pattern matching characters to match file names. Pattern matching is case-insensitive on Windows. For more information about supported pattern matching characters, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/using-workflows/workflow-syntax-for-github-actions/#filter-pattern-cheat-sheet)."
258258

content/admin/github-actions/managing-access-to-actions-from-githubcom/about-using-actions-in-your-enterprise.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ Each action is a repository in the `actions` organization, and each action repos
3535

3636
{% note %}
3737

38-
**Note:** When using setup actions (such as `actions/setup-LANGUAGE`) on {% data variables.product.product_name %} with self-hosted runners, you might need to set up the tools cache on runners that do not have internet access. For more information, see "[Setting up the tool cache on self-hosted runners without internet access](/enterprise/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access)."
38+
**Notes:**
39+
- When using setup actions (such as `actions/setup-LANGUAGE`) on {% data variables.product.product_name %} with self-hosted runners, you might need to set up the tools cache on runners that do not have internet access. For more information, see "[Setting up the tool cache on self-hosted runners without internet access](/enterprise/admin/github-actions/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access)."
40+
- Upgrades to {% data variables.product.product_name %} will not result in the bundled actions being updated.
3941

4042
{% endnote %}
4143

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Before you can authorize a personal access token or SSH key, you must have a linked SAML identity. If you're a member of an organization where SAML SSO is enabled, you can create a linked identity by authenticating to your organization with your IdP at least once. For more information, see "[About authentication with SAML single sign-on](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)."
22

3-
After you authorize a personal access token or SSH key, the authorization does not expire. The token or key will stay authorized until revoked in one of these ways.
3+
After you authorize a personal access token or SSH key. The token or key will stay authorized until revoked in one of these ways.
44
- An organization owner revokes the authorization.
55
- You are removed from the organization.
6-
- The scopes in a personal access token are edited, or the token is regenerated.
6+
- The scopes in a personal access token are edited, or the token is regenerated.
7+
- The personal access token expired as defined during creation.

lib/rest/static/decorated/api.github.com.json

Lines changed: 106 additions & 106 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)