Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from 'master' default branch to 'main' #51

Merged
merged 1 commit into from
Apr 17, 2021
Merged

Migrate from 'master' default branch to 'main' #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: ci
on:
pull_request:
branches:
- master
- main
jobs:
yamllint:
name: yamllint
Expand Down Expand Up @@ -73,13 +73,13 @@ jobs:
steps:
- name: Check out the code
uses: actions/checkout@v2
- name: Fetch master
- name: Fetch main
run: |
git remote -v
git fetch --depth=1 origin master
git fetch --depth=1 origin main
- name: Only allow go.mod and go.sum changes
run: |
find . -type f ! -name 'go.mod' ! -name 'go.sum' -exec git diff --exit-code origin/master -- {} +
find . -type f ! -name 'go.mod' ! -name 'go.sum' -exec git diff --exit-code origin/main -- {} +
- name: Automerge nsmbot PR
uses: ridedott/merge-me-action@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-for-updates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.NSM_BOT_GITHUB_TOKEN }}
BRANCH_PREFIX: "update/"
PULL_REQUEST_BRANCH: "master"
PULL_REQUEST_BRANCH: "main"