Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Commit 6af39ca

Browse files
authored
Merge pull request #31 from githubtraining/update-branch-defaults
Rename master to main
2 parents 291539a + 107e2bd commit 6af39ca

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ For more information on the goals of this course, check out the [`course-details
1414

1515
## Contribute
1616

17-
See something we could improve? Check out the contributing guide in the [community contributors repository](https://github.com/githubtraining/community-contributors/blob/master/CONTRIBUTING.md) for more information on the types of contributions we :heart: and instructions.
17+
See something we could improve? Check out the contributing guide in the [community contributors repository](https://github.com/githubtraining/community-contributors/blob/main/CONTRIBUTING.md) for more information on the types of contributions we :heart: and instructions.
1818

19-
We :heart: our community and take great care to ensure it is fun, safe and rewarding. Please review our [Code of Conduct](https://github.com/githubtraining/community-contributors/blob/master/CODE_OF_CONDUCT.md) for community expectations and guidelines for reporting concerns.
19+
We :heart: our community and take great care to ensure it is fun, safe and rewarding. Please review our [Code of Conduct](https://github.com/githubtraining/community-contributors/blob/main/CODE_OF_CONDUCT.md) for community expectations and guidelines for reporting concerns.
2020

2121
## License
2222

config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ before:
3232
title: Start here!
3333
body: 01_welcome-activity.md
3434
data:
35-
quicklink: "%payload.repository.html_url%/new/master?filename=.github/workflows/my-workflow.yml&workflow_template=blank"
35+
quicklink: "%payload.repository.html_url%/new/main?filename=.github/workflows/my-workflow.yml&workflow_template=blank"
3636
actionsUrl: "%payload.repository.html_url%/actions/new"
3737
steps:
3838
- title: Setup a workflow file
@@ -412,7 +412,7 @@ steps:
412412
issue: Knock knock...
413413
data:
414414
# The following workflowFile var does not point where it should for some reason
415-
workflowFile: "%payload.repository.html_url%/edit/master/.github/workflows/my-workflow.yml"
415+
workflowFile: "%payload.repository.html_url%/edit/main/.github/workflows/my-workflow.yml"
416416
actionsUrl: "%payload.repository.html_url%/actions"
417417

418418
- title: Prevent the workflow from running
@@ -639,7 +639,7 @@ steps:
639639
action_id: outputIssue
640640
data:
641641
actionsUrl: "%payload.repository.html_url%/actions"
642-
workflowFile: "%payload.repository.html_url%/edit/master/.github/workflows/my-workflow.yml"
642+
workflowFile: "%payload.repository.html_url%/edit/main/.github/workflows/my-workflow.yml"
643643
- type: respond
644644
with: 12_next-steps.md
645645
issue: External APIs

responses/07_add-input-params.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ if (thirdGreeting) {
9494

9595
By using `core.getInput()` we can specify the string of any input parameter we have placed inside of the `action.yml` file.
9696

97-
The `@actions/core` package brings a few more methods along with it to help us interact with the GitHub Actions platform. If writing actions is something you plan to continue doing it's work reading the [documentation](https://github.com/actions/toolkit/tree/master/packages/core) about this package.
97+
The `@actions/core` package brings a few more methods along with it to help us interact with the GitHub Actions platform. If writing actions is something you plan to continue doing it's work reading the [documentation](https://github.com/actions/toolkit/tree/main/packages/core) about this package.
9898

9999
---
100100

responses/08_experiment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Take a few minutes to play with the current code you have. I don't suggest edit
88
2. Add all three input parameter and be explicit with their values in the `my-workflow.yml` file. What happens when your action executes?
99
3. Specify only the `third-greeting` input parameter in the `my-workflow.yml` file. what happens when your action executes?
1010

11-
When you are finished experimenting and examining the results merge this pull request into the **master** branch.
11+
When you are finished experimenting and examining the results merge this pull request into the **main** branch.
1212

1313
Our next lesson will show you how to add external libraries to an action as well as interact with external APIs.
1414

responses/10_action-two.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Now that you have all the necessary tools installed locally, follow these steps
88

99
1. Open the **Terminal** (Mac and Linux) or **Command Prompt** (Windows) on your local machine
1010
1. Navigate to the `.github/` directory.
11-
1. Checkout the `master` branch
11+
1. Checkout the `main` branch
1212
```shell
13-
git checkout master
13+
git checkout main
1414
```
1515
1. Update the contents of your Learning Lab repo to your local machine:
1616
```shell

responses/10_create-js-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ We first bring in the `request-promise` library that we installed earlier using
5555

5656
Next we define a set of `options` that the `request-promise` library will use when it makes the request.
5757

58-
📖Read more about [request-promise](https://github.com/request/request-promise/blob/master/README.md)
58+
📖Read more about [request-promise](https://github.com/request/request-promise/)
5959

6060
Inside of the `options` block we add a key named `headers`. This defines the HTTP headers that the **icanhazdadjoke** API expects in each request that comes it's way.
6161

responses/12_trigger-workflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ Great job! Everything is all set up and now we are ready to start laughing 🤣.
1212

1313
Feel free to continue adding labels to this pull request if you want to see more jokes.
1414

15-
When you are ready to move forward in the lesson merge this pull request into the `master` branch.
15+
When you are ready to move forward in the lesson merge this pull request into the `main` branch.

responses/14_action-three.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Let's create our final project directory and install all the necessary dependenc
88

99
1. Open the **Terminal** (Mac and Linux) or **Command Prompt** (Windows) on your local machine
1010
1. navigate to the `.github/actions` directory.
11-
1. Checkout the `master` branch
11+
1. Checkout the `main` branch
1212
```shell
13-
git checkout master
13+
git checkout main
1414
```
1515
1. Update the contents of your Learning Lab repo to your local machine:
1616
```shell

0 commit comments

Comments
 (0)