Skip to content

Commit

Permalink
update references from master to main (#1176)
Browse files Browse the repository at this point in the history
We've renamed `master` to `main`.  Update the branch references from
master to main, and remove the references to master in the github
actions workflow files.
  • Loading branch information
tgummerer committed May 23, 2024
1 parent 26935c7 commit 4968bd8
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "master", "main" ]
branches: [ "main" ]
pull_request:
branches: [ "master", "main" ]
branches: [ "main" ]
schedule:
- cron: '31 7 * * 6'

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on: # rebuild any PRs and main branch changes
push:
branches:
- main
- master
paths-ignore:
- 'CHANGELOG.md'
- 'README.md'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/update_dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- main
- master

jobs:
update-dist:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
push:
branches:
- main
- master
paths-ignore:
- 'CHANGELOG.md'
- 'README.md'
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ latest release is `v3.18.1`, and you wish to cut `v.3.19.0`.
1. Checkout the default branch.

```bash
$ git checkout master
$ git checkout main
```

2. Open up `CHANGELOG.md`. Create a new h2 with the release version and the date
Expand Down Expand Up @@ -45,7 +45,7 @@ latest release is `v3.18.1`, and you wish to cut `v.3.19.0`.

3. Commit your changes to `CHANGELOG.md`, and open a PR. Once your changes have
been approved and status checks have passed, merge your PR into the default
branch, `master`.
branch, `main`.

4. Wait for status checks on the default branch to pass.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Here are some pointers when migrating from v1 to v2 of our GitHub Action.

- The action now runs natively, so the action workflow needs to have the correct
environment configured. There are
[sample workflows available](https://github.com/pulumi/actions/tree/master/.github/workflows).
[sample workflows available](https://github.com/pulumi/actions/tree/main/.github/workflows).
For examples, if you are running a NodeJS (for example) app then you need to
ensure that your action has NodeJS available to it:

Expand Down

0 comments on commit 4968bd8

Please sign in to comment.