Skip to content

Commit 4996deb

Browse files
authored
Merge branch 'main' into 3059-remove-send-from-author
2 parents 10d8f60 + faa156f commit 4996deb

24 files changed

Lines changed: 313 additions & 85 deletions

content/actions/hosting-your-own-runners/using-self-hosted-runners-in-a-workflow.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ These labels operate cumulatively, so a self-hosted runner’s labels must match
6464

6565
### Routing precedence for self-hosted runners
6666

67-
If you use both repository-level and organization-level runners, {% data variables.product.prodname_dotcom %} follows an order of precedence when routing jobs to self-hosted runners:
68-
69-
1. The job's `runs-on` labels are processed. {% data variables.product.prodname_dotcom %} then attempts to locate a runner that matches the label requirements:
70-
2. The job is sent to a repository-level runner that matches the job labels. If no repository-level runner is available (either busy, offline, or no matching labels):
71-
3. The job is sent to an organization-level runner that matches the job labels. If no organization-level runner is available, the job request fails with an error.
67+
When routing a job to a self-hosted runner, {% data variables.product.prodname_dotcom %} looks for a runner that matches the job's `runs-on` labels:
68+
69+
1. {% data variables.product.prodname_dotcom %} first searches for a runner at the repository level, then at the organization level{% if currentVersion ver_gt "enterprise-server@2.21" %}, then at the enterprise level{% endif %}.
70+
2. The job is then sent to the first matching runner that is online and idle.
71+
- If all matching online runners are busy, the job will queue at the level with the highest number of matching online runners.
72+
- If all matching runners are offline, the job will queue at the level with the highest number of matching offline runners.
73+
- If there are no matching runners at any level, the job will fail.
74+
- If the job remains queued for more than 24 hours, the job will fail.

content/actions/reference/workflow-syntax-for-github-actions.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,18 @@ steps:
701701

702702
You can set the `shell` value to a template string using `command […options] {0} [..more_options]`. {% data variables.product.prodname_dotcom %} interprets the first whitespace-delimited word of the string as the command, and inserts the file name for the temporary script at `{0}`.
703703

704+
For example:
705+
706+
```yaml
707+
steps:
708+
- name: Display the environment variables and their values
709+
run: |
710+
print %ENV
711+
shell: perl {0}
712+
```
713+
714+
The command used, `perl` in this example, must be installed on the runner. For information about the software included on GitHub-hosted runners, see "[Specifications for GitHub-hosted runners](/actions/reference/specifications-for-github-hosted-runners#supported-software)."
715+
704716
#### Exit codes and error action preference
705717

706718
For built-in shell keywords, we provide the following defaults that are executed by {% data variables.product.prodname_dotcom %}-hosted runners. You should use these guidelines when running shell scripts.

content/admin/configuration/configuring-email-for-notifications.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ You'll notice that `metroplex` catches the inbound message, processes it, then m
159159

160160
#### Verify your DNS settings
161161

162-
In order to properly process inbound emails, you must configure a valid A Record (or CNAME), as well as an MX Record. For more information, see "[Configuring DNS and firewall settings to allow incom
163-
emails](#configuring-dns-and-firewall-settings-to-allow-incoming-emails)."
162+
In order to properly process inbound emails, you must configure a valid A Record (or CNAME), as well as an MX Record. For more information, see "[Configuring DNS and firewall settings to allow incoming emails](#configuring-dns-and-firewall-settings-to-allow-incoming-emails)."
164163

165164
#### Check firewall or AWS Security Group settings
166165

content/github/managing-files-in-a-repository/navigating-code-on-github.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ versions:
99

1010
### About navigating code on {% data variables.product.prodname_dotcom %}
1111

12-
Navigating code functions use the open source library [`semantic`](https://github.com/github/semantic). The following languages are supported:
12+
Code navigation uses the open source library [`tree-sitter`](https://github.com/tree-sitter/tree-sitter). The following languages are supported:
1313
- C#
1414
- CodeQL
1515
- Go

content/github/site-policy/github-additional-product-terms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Actions and any elements of the Actions service may not be used in violation of
5555
- any activity that places a burden on our servers, where that burden is disproportionate to the benefits provided to users (for example, don't use Actions as a content delivery network or as part of a serverless application, but a low benefit Action could be ok if it’s also low burden); or
5656
- any other activity unrelated to the production, testing, deployment, or publication of the software project associated with the repository where GitHub Actions are used.
5757

58-
In order to prevent violations of these limitations and abuse of GitHub Actions, GitHub may monitor your use of GitHub Actions. Misuse of GitHub Actions may result in termination of jobs, or restrictions in your ability to use GitHub Actions.
58+
In order to prevent violations of these limitations and abuse of GitHub Actions, GitHub may monitor your use of GitHub Actions. Misuse of GitHub Actions may result in termination of jobs, restrictions in your ability to use GitHub Actions, or the disabling of repositories created to run Actions in a way that violates these Terms.
5959

6060
#### b. Packages Usage
6161
GitHub Packages is billed on a usage basis. The [Packages documentation](/packages) includes details, including bandwidth and storage quantities (depending on your Account plan), and how to monitor your Packages usage and set usage limits. Packages bandwidth usage is limited by the [GitHub Acceptable Use Polices](/github/site-policy/github-acceptable-use-policies).

content/github/site-policy/guidelines-for-legal-requests-of-user-data.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,14 @@ c/o Corporation Service Company
215215
2710 Gateway Oaks Drive, Suite 150N
216216
Sacramento, CA 95833-3505
217217
```
218+
Under state and federal law, GitHub can seek reimbursement for costs associated with compliance with a valid legal demand, such as a subpoena, court order or search warrant. We only charge to recover some costs, and these reimbursements cover only a portion of the costs we actually incur to comply with legal orders.
219+
220+
While we do not charge in emergency situations or in other exigent circumstances, we seek reimbursement for all other legal requests in accordance with the following schedule, unless otherwise required by law:
221+
222+
- Initial search of up to 25 identifiers: Free
223+
- Production of subscriber information/data for up to 5 accounts: Free
224+
- Production of subscriber information/data for more than 5 accounts: $20 per account
225+
- Secondary searches: $10 per search
218226

219227
Please make your requests as specific and narrow as possible, including the following information:
220228

content/rest/reference/permissions-required-for-github-apps.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,9 @@ _Teams_
842842

843843
- [`GET /repos/:owner/:repo/code-scanning/alerts`](/rest/reference/code-scanning#list-code-scanning-alerts-for-a-repository) (:read)
844844
- [`GET /repos/:owner/:repo/code-scanning/alerts/:alert_id`](/rest/reference/code-scanning#get-a-code-scanning-alert) (:read)
845+
- [`PATCH /repos/:owner/:repo/code-scanning/alerts/:alert_id`](/rest/reference/code-scanning#update-a-code-scanning-alert) (:write)
846+
- [`GET /repos/:owner/:repo/code-scanning/analyses`](/rest/reference/code-scanning#list-recent-code-scanning-analyses-for-a-repository) (:read)
847+
- [`POST /repos/:owner/:repo/code-scanning/sarifs`](/rest/reference/code-scanning#upload-a-sarif-file) (:write)
845848
{% endif %}
846849

847850
{% if currentVersion == "free-pro-team@latest" %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
If you're not a billing manger for the organization, ask your client to have an *owner* of the organization [add you to the organization as a billing manager](/articles/adding-a-billing-manager-to-your-organization).
1+
If you're not a billing manager for the organization, ask your client to have an *owner* of the organization [add you to the organization as a billing manager](/articles/adding-a-billing-manager-to-your-organization).

data/ui.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,6 @@ product_sublanding:
160160
tutorial: Tutorial
161161
how_to: How-to guide
162162
reference: Reference
163+
learning_track_nav:
164+
prevGuide: Previous Guide
165+
nextGuide: Next Guide

includes/article.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ <h2 id="in-this-article" class="f5 mb-2"><a class="link-gray-dark" href="#in-thi
6565
</div>
6666
</div>
6767

68-
<div class="d-block border-top border-gray-light mt-4 markdown-body">
68+
<div class="d-block mt-4 markdown-body">
69+
{% if currentLearningTrack and currentLearningTrack.trackName %}
70+
{% include learning-track-nav %}
71+
{% endif %}
6972
{% include helpfulness %}
7073
{% unless page.hidden %}{% include contribution %}{% endunless %}
7174
</div>

0 commit comments

Comments
 (0)