Skip to content

Commit 83fe9e2

Browse files
authored
Merge branch 'main' into patch-1
2 parents 6ba8f26 + 6afc62a commit 83fe9e2

10 files changed

Lines changed: 36 additions & 36 deletions

content/actions/guides/deploying-to-amazon-elastic-container-service.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
with:
108108
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
109109
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
110-
aws-region: $AWS_REGION
110+
aws-region: ${{ env.AWS_REGION }}
111111
112112
- name: Login to Amazon ECR
113113
id: login-ecr
@@ -124,22 +124,22 @@ jobs:
124124
# be deployed to ECS.
125125
docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
126126
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
127-
echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_ENV
127+
echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
128128
129129
- name: Fill in the new image ID in the Amazon ECS task definition
130130
id: task-def
131131
uses: aws-actions/amazon-ecs-render-task-definition@v1
132132
with:
133-
task-definition: $ECS_TASK_DEFINITION
134-
container-name: $CONTAINER_NAME
133+
task-definition: ${{ env.ECS_TASK_DEFINITION }}
134+
container-name: ${{ env.CONTAINER_NAME }}
135135
image: ${{ steps.build-image.outputs.image }}
136136
137137
- name: Deploy Amazon ECS task definition
138138
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
139139
with:
140140
task-definition: ${{ steps.task-def.outputs.task-definition }}
141-
service: $ECS_SERVICE
142-
cluster: $ECS_CLUSTER
141+
service: ${{ env.ECS_SERVICE }}
142+
cluster: ${{ env.ECS_CLUSTER }}
143143
wait-for-service-stability: true
144144
```
145145
{% endraw %}

content/actions/guides/publishing-nodejs-packages.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
steps:
7171
- uses: actions/checkout@v2
7272
# Setup .npmrc file to publish to npm
73-
- uses: actions/setup-node@v1
73+
- uses: actions/setup-node@v2
7474
with:
7575
node-version: '12.x'
7676
registry-url: 'https://registry.npmjs.org'
@@ -130,7 +130,7 @@ jobs:
130130
steps:
131131
- uses: actions/checkout@v2
132132
# Setup .npmrc file to publish to GitHub Packages
133-
- uses: actions/setup-node@v1
133+
- uses: actions/setup-node@v2
134134
with:
135135
node-version: '12.x'
136136
registry-url: 'https://npm.pkg.github.com'
@@ -167,7 +167,7 @@ jobs:
167167
steps:
168168
- uses: actions/checkout@v2
169169
# Setup .npmrc file to publish to npm
170-
- uses: actions/setup-node@v1
170+
- uses: actions/setup-node@v2
171171
with:
172172
node-version: '12.x'
173173
registry-url: 'https://registry.npmjs.org'

content/actions/reference/events-that-trigger-workflows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ jobs:
343343
- run: |
344344
echo "Comment on PR #${{ github.event.issue.number }}"
345345
346-
issue-commented:
346+
issue_commented:
347347
# This job only runs for issue comments
348348
name: Issue comment
349349
if: ${{ !github.event.issue.pull_request }}

content/developers/apps/creating-ci-tests-with-the-checks-api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ versions:
1212

1313
### Introduction
1414

15-
This guide will introduce you to [Github Apps](/apps/) and the [Checks API](/rest/reference/checks), which you'll use to build a continuous integration (CI) server that runs tests.
15+
This guide will introduce you to [GitHub Apps](/apps/) and the [Checks API](/rest/reference/checks), which you'll use to build a continuous integration (CI) server that runs tests.
1616

1717
CI is a software practice that requires frequently committing code to a shared repository. Committing code more often raises errors sooner and reduces the amount of code a developer needs to debug when finding the source of an error. Frequent code updates also make it easier to merge changes from different members of a software development team. This is great for developers, who can spend more time writing code and less time debugging errors or resolving merge conflicts. 🙌
1818

@@ -49,7 +49,7 @@ To get an idea of what your Checks API CI server will do when you've completed t
4949

5050
### Prerequisites
5151

52-
Before you get started, you may want to familiarize yourself with [Github Apps](/apps/), [Webhooks](/webhooks), and the [Checks API](/rest/reference/checks), if you're not already. You'll find more APIs in the [REST API docs](/rest). The Checks API is also available to use in [GraphQL](/graphql), but this quickstart focuses on REST. See the GraphQL [Checks Suite](/graphql/reference/objects#checksuite) and [Check Run](/graphql/reference/objects#checkrun) objects for more details.
52+
Before you get started, you may want to familiarize yourself with [GitHub Apps](/apps/), [Webhooks](/webhooks), and the [Checks API](/rest/reference/checks), if you're not already. You'll find more APIs in the [REST API docs](/rest). The Checks API is also available to use in [GraphQL](/graphql), but this quickstart focuses on REST. See the GraphQL [Checks Suite](/graphql/reference/objects#checksuite) and [Check Run](/graphql/reference/objects#checkrun) objects for more details.
5353

5454
You'll use the [Ruby programming language](https://www.ruby-lang.org/en/), the [Smee](https://smee.io/) webhook payload delivery service, the [Octokit.rb Ruby library](http://octokit.github.io/octokit.rb/) for the GitHub REST API, and the [Sinatra web framework](http://sinatrarb.com/) to create your Checks API CI server app.
5555

@@ -203,7 +203,7 @@ Great! You've told GitHub to create a check run. You can see the check run statu
203203

204204
### Step 1.4. Updating a check run
205205

206-
When your `create_check_run` method runs, it asks GitHub to create a new check run. When Github finishes creating the check run, you'll receive the `check_run` webhook event with the `created` action. That event is your signal to begin running the check.
206+
When your `create_check_run` method runs, it asks GitHub to create a new check run. When GitHub finishes creating the check run, you'll receive the `check_run` webhook event with the `created` action. That event is your signal to begin running the check.
207207

208208
You'll want to update your event handler to look for the `created` action. While you're updating the event handler, you can add a conditional for the `rerequested` action. When someone re-runs a single test on GitHub by clicking the "Re-run" button, GitHub sends the `rerequested` check run event to your app. When a check run is `rerequested`, you'll want to start the process all over and create a new check run.
209209

content/developers/apps/migrating-oauth-apps-to-github-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ GitHub Apps use [sliding rules for rate limits](/apps/building-github-apps/under
5252

5353
#### Register a new GitHub App
5454

55-
Once you've decided to make the switch to Github Apps, you'll need to [create a new GitHub App](/apps/building-github-apps/).
55+
Once you've decided to make the switch to GitHub Apps, you'll need to [create a new GitHub App](/apps/building-github-apps/).
5656

5757
#### Determine the permissions your app requires
5858

@@ -62,7 +62,7 @@ In your GitHub App's settings, you can specify whether your app needs `No Access
6262

6363
#### Subscribe to webhooks
6464

65-
After you've created a new GitHub App and selected its permissions, you can select the webhook events you wish to subscribe it to. See "[Editing a Github App's permissions](/apps/managing-github-apps/editing-a-github-app-s-permissions/)" to learn how to subscribe to webhooks.
65+
After you've created a new GitHub App and selected its permissions, you can select the webhook events you wish to subscribe it to. See "[Editing a GitHub App's permissions](/apps/managing-github-apps/editing-a-github-app-s-permissions/)" to learn how to subscribe to webhooks.
6666

6767
#### Understand the different methods of authentication
6868

content/developers/github-marketplace/handling-new-purchases-and-free-trials.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ versions:
1414

1515
{% warning %}
1616

17-
If you offer a GitHub App in {% data variables.product.prodname_marketplace %}, your app must identify users following the OAuth authorization flow. You don't need to set up a separate OAuth App to support this flow. See "[Identifying and authorizing users for GitHub Apps](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)" for more information.
17+
If you offer a {% data variables.product.prodname_github_app %} in {% data variables.product.prodname_marketplace %}, your app must identify users following the OAuth authorization flow. You don't need to set up a separate {% data variables.product.prodname_oauth_app %} to support this flow. See "[Identifying and authorizing users for {% data variables.product.prodname_github_apps %}](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)" for more information.
1818

1919
{% endwarning %}
2020

@@ -24,7 +24,7 @@ Before a customer purchases your {% data variables.product.prodname_marketplace
2424

2525
The customer completes the purchase by clicking **Complete order and begin installation**.
2626

27-
GitHub then sends the [`marketplace_purchase`](/webhooks/event-payloads/#marketplace_purchase) webhook with the `purchased` action to your app.
27+
{% data variables.product.product_name %} then sends the [`marketplace_purchase`](/webhooks/event-payloads/#marketplace_purchase) webhook with the `purchased` action to your app.
2828

2929
Read the `effective_date` and `marketplace_purchase` object from the `marketplace_purchase` webhook to determine which plan the customer purchased, when the billing cycle starts, and when the next billing cycle begins.
3030

@@ -34,27 +34,27 @@ See "[{% data variables.product.prodname_marketplace %} webhook events](/marketp
3434

3535
### Step 2. Installation
3636

37-
If your app is a GitHub App, GitHub prompts the customer to select which repositories the app can access when they purchase it. GitHub then installs the app on the account the customer selected and grants access to the selected repositories.
37+
If your app is a {% data variables.product.prodname_github_app %}, {% data variables.product.product_name %} prompts the customer to select which repositories the app can access when they purchase it. {% data variables.product.product_name %} then installs the app on the account the customer selected and grants access to the selected repositories.
3838

39-
At this point, if you specified a **Setup URL** in your GitHub App settings, Github will redirect the customer to that URL. If you do not specify a setup URL, you will not be able to handle purchases of your GitHub App.
39+
At this point, if you specified a **Setup URL** in your {% data variables.product.prodname_github_app %} settings, {% data variables.product.product_name %} will redirect the customer to that URL. If you do not specify a setup URL, you will not be able to handle purchases of your {% data variables.product.prodname_github_app %}.
4040

4141
{% note %}
4242

43-
**Note:** The **Setup URL** is described as optional in GitHub App settings, but it is a required field if you want to offer your app in {% data variables.product.prodname_marketplace %}.
43+
**Note:** The **Setup URL** is described as optional in {% data variables.product.prodname_github_app %} settings, but it is a required field if you want to offer your app in {% data variables.product.prodname_marketplace %}.
4444

4545
{% endnote %}
4646

47-
If your app is an OAuth App, GitHub does not install it anywhere. Instead, GitHub redirects the customer to the **Installation URL** you specified in your [{% data variables.product.prodname_marketplace %} listing](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/#listing-urls).
47+
If your app is an {% data variables.product.prodname_oauth_app %}, {% data variables.product.product_name %} does not install it anywhere. Instead, {% data variables.product.product_name %} redirects the customer to the **Installation URL** you specified in your [{% data variables.product.prodname_marketplace %} listing](/marketplace/listing-on-github-marketplace/writing-github-marketplace-listing-descriptions/#listing-urls).
4848

49-
When a customer purchases an OAuth App, GitHub redirects the customer to the URL you choose (either Setup URL or Installation URL) and the URL includes the customer's selected pricing plan as a query parameter: `marketplace_listing_plan_id`.
49+
When a customer purchases an {% data variables.product.prodname_oauth_app %}, {% data variables.product.product_name %} redirects the customer to the URL you choose (either Setup URL or Installation URL) and the URL includes the customer's selected pricing plan as a query parameter: `marketplace_listing_plan_id`.
5050

5151
### Step 3. Authorization
5252

5353
When a customer purchases your app, you must send the customer through the OAuth authorization flow:
5454

55-
* If your app is a GitHub App, begin the authorization flow as soon as GitHub redirects the customer to the **Setup URL**. Follow the steps in "[Identifying and authorizing users for GitHub Apps](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)."
55+
* If your app is a {% data variables.product.prodname_github_app %}, begin the authorization flow as soon as {% data variables.product.product_name %} redirects the customer to the **Setup URL**. Follow the steps in "[Identifying and authorizing users for {% data variables.product.prodname_github_apps %}](/apps/building-github-apps/identifying-and-authorizing-users-for-github-apps/)."
5656

57-
* If your app is an OAuth App, begin the authorization flow as soon as GitHub redirects the customer to the **Installation URL**. Follow the steps in "[Authorizing OAuth Apps](/apps/building-oauth-apps/authorizing-oauth-apps/)."
57+
* If your app is an {% data variables.product.prodname_oauth_app %}, begin the authorization flow as soon as {% data variables.product.product_name %} redirects the customer to the **Installation URL**. Follow the steps in "[Authorizing {% data variables.product.prodname_oauth_apps %}](/apps/building-oauth-apps/authorizing-oauth-apps/)."
5858

5959
For either type of app, the first step is to redirect the customer to https://github.com/login/oauth/authorize.
6060

content/github/setting-up-and-managing-organizations-and-teams/configuring-saml-single-sign-on-and-scim-using-okta.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ After you enable SCIM, the following provisioning features are available for any
6464
!["Grant" button for authorizing Okta SCIM integration to access organization](/assets/images/help/saml/okta-scim-integration-grant-organization-access.png)
6565

6666
{% note %}
67-
67+
6868
**Note**: If you don't see your organization in the list, go to `https://github.com/orgs/ORGANIZATION-NAME/sso` in your browser and authenticate with your organization via SAML SSO using your administrator account on the IdP. For example, if your organization's name is `octo-org`, the URL would be `https://github.com/orgs/octo-org/sso`. For more information, see "[About authentication with SAML single sign-on](/github/authenticating-to-github/about-authentication-with-saml-single-sign-on)."
69-
69+
7070
{% endnote %}
7171
1. Click **Authorize OktaOAN**.
7272
!["Authorize OktaOAN" button for authorizing Okta SCIM integration to access organization](/assets/images/help/saml/okta-scim-integration-authorize-oktaoan.png)

content/rest/guides/basics-of-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ To help you gracefully handle these situations, all API responses for requests
165165
made with valid tokens also contain an [`X-OAuth-Scopes` header][oauth scopes].
166166
This header contains the list of scopes of the token that was used to make the
167167
request. In addition to that, the OAuth Applications API provides an endpoint to {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" %}
168-
[check a token for validity][/rest/reference/apps#check-a-token]{% else %}[check a token for validity][/rest/reference/apps#check-an-authorization]{% endif %}.
168+
[check a token for validity](/rest/reference/apps#check-a-token){% else %}[check a token for validity](/rest/reference/apps#check-an-authorization){% endif %}.
169169
Use this information to detect changes in token scopes, and inform your users of
170170
changes in available application functionality.
171171

content/rest/overview/libraries.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ versions:
2525

2626
### Clojure
2727

28-
Library name | Repository
28+
Library name | Repository
2929
|---|---|
3030
**Tentacles**| [Raynes/tentacles](https://github.com/Raynes/tentacles)
3131

@@ -80,7 +80,7 @@ Library name | Repository |
8080

8181
Library name | Repository |
8282
|---|---|
83-
**Github.jl**|[WestleyArgentum/Github.jl](https://github.com/WestleyArgentum/GitHub.jl)
83+
**GitHub.jl**|[WestleyArgentum/GitHub.jl](https://github.com/WestleyArgentum/GitHub.jl)
8484

8585
### OCaml
8686

@@ -93,7 +93,7 @@ Library name | Repository |
9393
Library name | Repository | metacpan Website for the Library
9494
|---|---|---|
9595
**Pithub**|[plu/Pithub](https://github.com/plu/Pithub)|[Pithub CPAN](http://metacpan.org/module/Pithub)
96-
**Net::Github**|[fayland/perl-net-github](https://github.com/fayland/perl-net-github)|[Net:Github CPAN](https://metacpan.org/pod/Net::GitHub)
96+
**Net::GitHub**|[fayland/perl-net-github](https://github.com/fayland/perl-net-github)|[Net:GitHub CPAN](https://metacpan.org/pod/Net::GitHub)
9797

9898
### PHP
9999

@@ -105,8 +105,8 @@ Library name | Repository
105105
**GitHub Joomla! Package**|[joomla-framework/github-api](https://github.com/joomla-framework/github-api)
106106
**GitHub Nette Extension**|[kdyby/github](https://github.com/kdyby/github)
107107
**GitHub API Easy Access**|[milo/github-api](https://github.com/milo/github-api)
108-
**GitHub bridge for Laravel**|[GrahamCampbell/Laravel-Github](https://github.com/GrahamCampbell/Laravel-GitHub)
109-
**PHP7 Client & WebHook wrapper**|[FlexyProject/GithubAPI](https://github.com/FlexyProject/GitHubAPI)
108+
**GitHub bridge for Laravel**|[GrahamCampbell/Laravel-GitHub](https://github.com/GrahamCampbell/Laravel-GitHub)
109+
**PHP7 Client & WebHook wrapper**|[FlexyProject/GitHubAPI](https://github.com/FlexyProject/GitHubAPI)
110110

111111
### Python
112112

data/variables/action_code_examples.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
- issues
2020
- labels
2121
- title: Add releases to GitHub
22-
description: Publish Github releases in an action
22+
description: Publish GitHub releases in an action
2323
languages: 'Dockerfile, Shell'
2424
href: elgohr/Github-Release-Action
2525
tags:
2626
- releases
2727
- publishing
2828
- title: Publish a docker image to Dockerhub
29-
description: A Github Action used to build and publish Docker images
29+
description: A GitHub Action used to build and publish Docker images
3030
languages: 'Dockerfile, Shell'
3131
href: elgohr/Publish-Docker-Github-Action
3232
tags:
@@ -106,15 +106,15 @@
106106
- wiki
107107
- publishing
108108
- title: Label your Pull Requests auto-magically (using committed files)
109-
description: Github action to label your pull requests auto-magically (using committed files)
109+
description: GitHub action to label your pull requests auto-magically (using committed files)
110110
languages: 'TypeScript, Dockerfile, JavaScript'
111111
href: Decathlon/pull-request-labeler-action
112112
tags:
113113
- projects
114114
- issues
115115
- labels
116116
- title: Add Label to your Pull Requests based on the author team name
117-
description: Github action to label your pull requests based on the author name
117+
description: GitHub action to label your pull requests based on the author name
118118
languages: 'TypeScript, JavaScript'
119119
href: JulienKode/team-labeler-action
120120
tags:

0 commit comments

Comments
 (0)