Skip to content

Commit b7ae2ed

Browse files
authored
Merge pull request #39041 from github/repo-sync
Repo sync
2 parents 5069b6b + b717751 commit b7ae2ed

File tree

11 files changed

+134
-297
lines changed

11 files changed

+134
-297
lines changed

.github/workflows/purge-old-workflow-runs.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

content/actions/monitoring-and-troubleshooting-workflows/troubleshooting-workflows/about-troubleshooting-workflows.md

Lines changed: 67 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ shortTitle: About troubleshooting
1010

1111
{% data reusables.actions.enterprise-github-hosted-runners %}
1212

13-
## Troubleshooting your workflows
13+
## Initial troubleshooting suggestions
1414

1515
There are several ways you can troubleshoot failed workflow runs.
1616

@@ -30,18 +30,79 @@ Each workflow run generates activity logs that you can view, search, and downloa
3030

3131
If the workflow logs do not provide enough detail to diagnose why a workflow, job, or step is not working as expected, you can enable additional debug logging. For more information, see [AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging).
3232

33-
### Canceling a workflow
33+
If your workflow uses specific tools or actions, enabling their debug or verbose logging options can help generate more detailed output for troubleshooting.
34+
For example, you can use `npm install --verbose` for npm or `GIT_TRACE=1 GIT_CURL_VERBOSE=1 git ...` for git.
3435

35-
If you attempt to cancel a workflow and the cancellation doesn't succeed, make sure you aren't using the `always` expression. The `always` expression causes a workflow step to run even when the workflow is canceled, which results in a hanging cancellation. For more information, see [AUTOTITLE](/actions/learn-github-actions/expressions#always).
36+
{% ifversion fpt or ghec %}
37+
38+
## Reviewing billing errors
39+
40+
Actions usage includes runner minutes and storage for [workflow artifacts](/actions/writing-workflows/choosing-what-your-workflow-does/storing-and-sharing-data-from-a-workflow). For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions).
41+
42+
### Setting a budget
43+
44+
Setting an Actions budget may help immediately unblock workflows failing due to billing or storage errors. It will allow further minutes and storage usage to be billed up to the set budget amount. To learn more, see [AUTOTITLE](/billing/managing-your-billing/preventing-overspending).
45+
46+
{% endif %}
3647

3748
{% ifversion actions-metrics %}
3849

39-
## Troubleshooting {% data variables.product.prodname_actions %} inefficiencies
50+
## Reviewing {% data variables.product.prodname_actions %} activity with metrics
4051

41-
To analyze the inefficiencies and reliability of your workflows using metrics, see [AUTOTITLE](/actions/administering-github-actions/viewing-github-actions-metrics).
52+
To analyze the efficiency and reliability of your workflows using metrics, see [AUTOTITLE](/actions/administering-github-actions/viewing-github-actions-metrics).
4253
{% endif %}
4354

44-
## Troubleshooting self-hosted runners
55+
## Troubleshooting workflow triggers
56+
57+
You can review your workflow’s `on:` field to understand what is expected to trigger the workflow. For more information, see [AUTOTITLE](/actions/writing-workflows/choosing-when-your-workflow-runs/triggering-a-workflow).
58+
59+
For a full list of available events, see [AUTOTITLE](/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows).
60+
61+
### Triggering event conditions
62+
63+
Some triggering events only run from the default branch (i.e. `issues`, `schedule`). Workflow file versions that exist outside of the default branch will not trigger on these events.
64+
65+
Workflows will not run on `pull_request` activity if the pull request has a merge conflict.
66+
67+
Workflows that would otherwise be triggered on `push` or `pull_request` activity will be skipped if the commit message contains a skip annotation. For more information, see [AUTOTITLE](/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/skipping-workflow-runs).
68+
69+
### Scheduled workflows running at unexpected times
70+
71+
Scheduled events can be delayed during periods of high loads of {% data variables.product.prodname_actions %} workflow runs.
72+
73+
High load times include the start of every hour. If the load is sufficiently high enough, some queued jobs may be dropped. To decrease the chance of delay, schedule your workflow to run at a different time of the hour. For more information, see [AUTOTITLE](/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#schedule).
74+
75+
### Filtering and diff limits
76+
77+
Specific events allow for filtering by branch, tag, and/or paths you can customize. Workflow run creation will be skipped if the filter conditions apply to filter out the workflow.
78+
79+
You can use special characters with filters. For more information, see [AUTOTITLE](/actions/writing-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet).
80+
81+
For path filtering, evaluating diffs is limited to the first 300 files. If there are files changed that are not matched in the first 300 files returned by the filter, the workflow will not be run. For more information, see [AUTOTITLE](/actions/writing-workflows/workflow-syntax-for-github-actions#git-diff-comparisons).
82+
83+
## Troubleshoot workflow execution
84+
85+
Workflow execution involves any issues seen after the workflow was triggered and a workflow run has been created.
86+
87+
### Canceling Workflows
88+
89+
If standard cancellation through the [UI](/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/canceling-a-workflow) or [API](/rest/actions/workflow-runs?apiVersion=2022-11-28#cancel-a-workflow-run) does not process as expected, there may be a conditional statement configured for your running workflow job(s) that causes it to not cancel.
90+
91+
In these cases, you can leverage the API to force cancel the run. For more information, see [AUTOTITLE](/rest/actions/workflow-runs?apiVersion=2022-11-28#force-cancel-a-workflow-run).
92+
93+
A common cause can be using the `always()` [status check function](/actions/writing-workflows/choosing-what-your-workflow-does/evaluate-expressions-in-workflows-and-actions#status-check-functions) which returns `true`, even on cancellation. An alternative is to use the inverse of the `cancelled()` function, `{% raw %}${{ !cancelled() }}{% endraw %}`.
94+
95+
For more information, see [AUTOTITLE](/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution) and [AUTOTITLE](/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/canceling-a-workflow#steps-github-takes-to-cancel-a-workflow-run).
96+
97+
## Troubleshooting runners
98+
99+
### Defining runner labels
100+
101+
{% data variables.product.github %}-hosted runners leverage [preset labels](/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories) maintained through the [`actions/runner-images`](https://github.com/actions/runner-images?tab=readme-ov-file#available-images) repository.
102+
103+
We recommend using unique label names for larger and self-hosted runners. If a label matches to any of the existing preset labels, there can be runner assignment issues where there is no guarantee on which matching runner option the job will run on.
104+
105+
### Self-hosted runners
45106

46107
If you use self-hosted runners, you can view their activity and diagnose common issues.
47108

content/site-policy/github-terms/github-pre-release-license-terms.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ These terms apply to the pre-release software made available to you by GitHub. T
1818

1919
## 1. Pre-Release Software.
2020

21-
The software provided is a pre-release version. “Pre-release” means software, online services, and additional products and features that are provided for preview, evaluation, demonstration, or trial purposes, as well as prerelease versions of those such as alpha, beta, or early access versions.
21+
The software provided is a pre-release version. “Pre-release” means software, online services, and additional products and features that are not yet generally available, such as alpha, beta, early access, technical preview, or similar versions.
2222

2323
Pre-release software may not operate correctly. It may delete your data, corrupt your data, or have other bugs. It also may not work the way a final commercial version of the software will.
2424

@@ -54,9 +54,17 @@ These terms apply to the pre-release software made available to you by GitHub. T
5454

5555
## 4. Data Collection and Usage.
5656

57-
a. **Consent to Data Collection.** The pre-release software may collect information about you and your use of the software, and send that information to GitHub. GitHub may use this information to provide services, to improve our products and services, or for any other purpose permitted under the GitHub Data Protection Agreement or GitHub Privacy Statement. Your use of the pre-release software operates as your consent to these practices.
58-
59-
b. **Use of Collected Data.** GitHub will use collected data for analytics and measurement to understand how our pre-release software and related products are used. The software will collect data and usage information about events generated when interacting with it. These events help us analyze and measure performance and features used. This usage information is used by GitHub and may be shared with affiliates and other third parties to help deliver, develop, evaluate, and improve the software and related products. We analyze data to ensure the pre-release software is working as intended, to evaluate the safety, reliability, and user experience of the software, and to investigate and detect potential abuse. We may combine the information we collect from the pre-release software with other data.
57+
a. **Consent to Data Collection.** The pre-release software may collect telemetry information about you and your use of the software, and send that information to GitHub. Subject to the limitations in Section 4(b) below, GitHub may use this information to provide services, to improve our products and services, or for any other purpose permitted under the GitHub Data Protection Agreement or GitHub Privacy Statement. Your use of the pre-release software operates as your consent to these practices.
58+
59+
b. **Use of Collected Data.**
60+
* GitHub will use collected data for analytics and measurement to understand how our pre-release software and related products are used.
61+
* The software will collect data and usage information about events generated when interacting with it. These events help us analyze and measure performance and features used. This usage information is used by GitHub and may be shared with affiliates and other third parties to help deliver, develop, evaluate, and improve the software and related products.
62+
* We analyze data to ensure the pre-release software is working as intended, to evaluate the safety, reliability, and user experience of the software, and to investigate and detect potential abuse.
63+
* We may combine the information we collect from the pre-release software with other data.
64+
* For pre-release software that uses AI:
65+
* You retain ownership of the code that you input to the software.
66+
* GitHub does not own the output sent to you by the software.
67+
* GitHub will not use your inputs or the outputs generated to train AI language models, unless you have instructed us in writing to do so.
6068

6169
c. **Processing of Personal Data.** GitHub is the data controller in relation to the Personal Data processed in connection with the pre-release software.
6270

data/reusables/contributing/content-linter-rules.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
| [search-replace](https://github.com/OnkarRuikar/markdownlint-rule-search-replace) | deprecated liquid syntax: octicon-<icon-name> | The octicon liquid syntax used is deprecated. Use this format instead `octicon "<octicon-name>" aria-label="<Octicon aria label>"` | error | |
3232
| [GH001](https://github.com/github/markdownlint-github/blob/main/docs/rules/GH001-no-default-alt-text.md) | no-default-alt-text | Images should have meaningful alternative text (alt text) | error | accessibility, images |
3333
| [GH002](https://github.com/github/markdownlint-github/blob/main/docs/rules/GH002-no-generic-link-text.md) | no-generic-link-text | Avoid using generic link text like `Learn more` or `Click here` | error | accessibility, links |
34+
| GHD030 | code-fence-line-length | Code fence lines should not exceed a maximum length | warning | code, accessibility |
3435
| GHD032 | image-alt-text-end-punctuation | Alternate text for images should end with punctuation | error | accessibility, images |
3536
| GHD004 | image-file-kebab-case | Image file names must use kebab-case | error | images |
3637
| GHD033 | incorrect-alt-text-length | Images alternate text should be between 40-150 characters | warning | accessibility, images |
@@ -65,4 +66,7 @@
6566
| GHD041 | third-party-action-pinning | Code examples that use third-party actions must always pin to a full length commit SHA | error | feature, actions |
6667
| GHD042 | liquid-tag-whitespace | Liquid tags should start and end with one whitespace. Liquid tag arguments should be separated by only one whitespace. | error | liquid, format |
6768
| GHD043 | link-quotation | Internal link titles must not be surrounded by quotations | error | links, url |
68-
| GHD044 | octicon-aria-labels | Octicons should always have an aria-label attribute even if aria-hidden. | warning | accessibility, octicons |
69+
| GHD044 | octicon-aria-labels | Octicons should always have an aria-label attribute even if aria-hidden. | warning | accessibility, octicons |
70+
| GHD048 | british-english-quotes | Periods and commas should be placed inside quotation marks (American English style) | warning | punctuation, quotes, style, consistency |
71+
| GHD050 | multiple-emphasis-patterns | Do not use more than one emphasis/strong, italics, or uppercase for a string | warning | formatting, emphasis, style |
72+
| GHD049 | note-warning-formatting | Note and warning tags should be formatted according to style guide | warning | formatting, callouts, notes, warnings, style |

package-lock.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
"prevent-pushes-to-main": "tsx src/workflows/prevent-pushes-to-main.ts",
7373
"purge-fastly-edge-cache": "tsx src/workflows/purge-fastly-edge-cache.ts",
7474
"purge-fastly-edge-cache-per-language": "tsx src/languages/scripts/purge-fastly-edge-cache-per-language.js",
75-
"purge-old-workflow-runs": "tsx src/workflows/purge-old-workflow-runs.js",
7675
"ready-for-docs-review": "tsx src/workflows/ready-for-docs-review.ts",
7776
"release-banner": "tsx src/ghes-releases/scripts/release-banner.ts",
7877
"repo-sync": "./src/workflows/local-repo-sync.sh",
@@ -283,7 +282,7 @@
283282
"helmet": "^8.0.0",
284283
"highlight.js": "^11.11.1",
285284
"highlightjs-curl": "^1.3.0",
286-
"hot-shots": "^10.0.0",
285+
"hot-shots": "^11.1.0",
287286
"html-entities": "^2.5.6",
288287
"http-proxy-middleware": "^3.0.5",
289288
"imurmurhash": "^0.1.4",

src/content-linter/style/github-docs.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ const githubDocsConfig = {
101101
'partial-markdown-files': true,
102102
'yml-files': true,
103103
},
104+
'code-fence-line-length': {
105+
// GHD030
106+
severity: 'warning',
107+
'partial-markdown-files': true,
108+
'yml-files': true,
109+
},
104110
'image-alt-text-exclude-words': {
105111
// GHD031
106112
severity: 'error',
@@ -174,6 +180,24 @@ const githubDocsConfig = {
174180
'partial-markdown-files': true,
175181
'yml-files': true,
176182
},
183+
'british-english-quotes': {
184+
// GHD048
185+
severity: 'warning',
186+
'partial-markdown-files': true,
187+
'yml-files': true,
188+
},
189+
'note-warning-formatting': {
190+
// GHD049
191+
severity: 'warning',
192+
'partial-markdown-files': true,
193+
'yml-files': true,
194+
},
195+
'multiple-emphasis-patterns': {
196+
// GHD050
197+
severity: 'warning',
198+
'partial-markdown-files': true,
199+
'yml-files': true,
200+
},
177201
}
178202

179203
export const githubDocsFrontmatterConfig = {

src/search/components/input/AskAIResults.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,9 +481,8 @@ export function AskAIResults({
481481
></IconButton>
482482
</div>
483483
) : null}
484-
{!aiCouldNotAnswer && references && references.length > 0 ? (
484+
{!aiCouldNotAnswer && !responseLoading && references && references.length > 0 ? (
485485
<>
486-
<ActionList.Divider aria-hidden="true" />
487486
<ActionList className={styles.referencesList} showDividers>
488487
<ActionList.Group>
489488
<ActionList.GroupHeading

src/search/components/input/SearchOverlay.tsx

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,11 @@ export function SearchOverlay({
377377
eventGroupId: askAIEventGroupId.current,
378378
})
379379
setSelectedIndex(-1)
380+
setSearchLoading(true)
380381
updateParams({
381382
'search-overlay-ask-ai': 'true',
382383
'search-overlay-input': selectedOption.term,
383384
})
384-
setSearchLoading(true)
385385
setAIQuery(selectedOption.term)
386386
inputRef.current?.focus()
387387
}
@@ -645,6 +645,7 @@ export function SearchOverlay({
645645
listElementsRef,
646646
askAIState,
647647
showSpinner,
648+
searchLoading,
648649
previousSuggestionsListHeight,
649650
)}
650651
</ActionList>
@@ -673,6 +674,7 @@ export function SearchOverlay({
673674
listElementsRef,
674675
askAIState,
675676
showSpinner,
677+
searchLoading,
676678
previousSuggestionsListHeight,
677679
)}
678680
</ActionList>
@@ -883,14 +885,16 @@ function renderSearchGroups(
883885
setAICouldNotAnswer: (value: boolean) => void
884886
},
885887
showSpinner: boolean,
888+
searchLoading: boolean,
886889
previousSuggestionsListHeight: number | string,
887890
) {
888891
const groups = []
889892

890893
let isInAskAIState = askAIState?.isAskAIState && !askAIState.aiSearchError
891894
let isInAskAIStateButNoAnswer = isInAskAIState && askAIState.aiCouldNotAnswer
892895

893-
// already showing spinner when streaming AI response, so don't want to show 2 here
896+
// This spinner is for both the AI search and the general search results.
897+
// We already show a spinner when streaming AI response, so don't want to show 2 here
894898
if (showSpinner && !isInAskAIState) {
895899
groups.push(
896900
<Box
@@ -1005,7 +1009,19 @@ function renderSearchGroups(
10051009
<ActionList.GroupHeading as="h3" tabIndex={-1}>
10061010
{t('search.overlay.general_suggestions_list_heading')}
10071011
</ActionList.GroupHeading>
1008-
{items}
1012+
{searchLoading && isInAskAIState ? (
1013+
<Box
1014+
role="status"
1015+
className={styles.loadingContainer}
1016+
sx={{
1017+
height: `${previousSuggestionsListHeight}px`,
1018+
}}
1019+
>
1020+
<Spinner />
1021+
</Box>
1022+
) : (
1023+
items
1024+
)}
10091025
</ActionList.Group>,
10101026
)
10111027

0 commit comments

Comments
 (0)