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

Commit

Permalink
Merge pull request #33 from githubtraining/MasterToMain
Browse files Browse the repository at this point in the history
Change master to main
  • Loading branch information
davenowell authored Dec 3, 2020
2 parents 09bfbef + 984019e commit 7e40f94
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This course is currently in production. It was designed to meet the learning out
- to change the starter code for the learner, edit the [template repository](https://lab.github.com/docs/course-ownership-and-repositories#the-repositories)
1. Commit your changes to your fork.
1. Open a pull request with:
- base branch: the master branch of this repository
- base branch: the main branch of this repository
- compare branch: the branch containing your commits in your fork
1. Wait for a review from the Learning Lab team, which will be automatically requested

Expand Down Expand Up @@ -61,4 +61,4 @@ There are many ways you can contribute! Here are just a few:

### Releasing

When your course branch has been merged into `master`, the [course version](https://lab.github.com/docs/course-versioning) on Learning Lab will automatically update and any new learners will receive the updated version of the course. There are no additional requirements on your part.
When your course branch has been merged into `main`, the [course version](https://lab.github.com/docs/course-versioning) on Learning Lab will automatically update and any new learners will receive the updated version of the course. There are no additional requirements on your part.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ For more information on the goals of this course, check out the [`course-details

## Contribute

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.
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.

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.
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.

## License

Expand Down
4 changes: 2 additions & 2 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ template:
name: hello-github-actions
repo: hello-github-actions-template
before:
# protect the master branch
# protect the main branch
- type: updateBranchProtection

# open issue 1 (welcome)
Expand All @@ -18,7 +18,7 @@ before:
comments:
- 00.1_first-steps.md
data:
dockerfileUrl: "%payload.repository.html_url%/new/master?filename=action-a/Dockerfile"
dockerfileUrl: "%payload.repository.html_url%/new/main?filename=action-a/Dockerfile"

# Repo artifacts:
# Issue 1: Welcome
Expand Down
2 changes: 1 addition & 1 deletion responses/00.1_first-steps.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Our action will use a Docker container so it will require a `Dockerfile`. Let's

1. Commit your file
- If you're working locally, you will also need stage your file and to push the branch to GitHub.
1. Open a pull request with your new branch against `master`
1. Open a pull request with your new branch against `main`
<hr>
<h3 align="center">I'll respond in your new pull request with next steps.</h3>
4 changes: 2 additions & 2 deletions responses/06.0_workflow-success.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ You should see the string "Hello world, I'm Mona!" printed at the bottom to `std

## Step 7: Incorporate the workflow

As a final step, merge this pull request so the action will be a part of the `master` branch.
As a final step, merge this pull request so the action will be a part of the `main` branch.

Anyone that uses this repository, and any future code can benefit from this workflow and your new action!

### :keyboard: Activity: Merge your workflow into the `master` branch
### :keyboard: Activity: Merge your workflow into the `main` branch

1. Merge this pull request
1. Delete your branch
Expand Down

0 comments on commit 7e40f94

Please sign in to comment.