Skip to content

Commit

Permalink
fix(build): migrate to main branch (#273)
Browse files Browse the repository at this point in the history
  • Loading branch information
bcoe authored Sep 3, 2021
1 parent eb59d1c commit 6707beb
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ rebaseMergeAllowed: true
squashMergeAllowed: true
mergeCommitAllowed: false
branchProtectionRules:
- pattern: master
- pattern: main
requiredStatusCheckContexts:
- 'cla/google'
requiredApprovingReviewCount: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/client_node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ name: Run Node Client Generator and Create Pull Request
on:
push:
branches:
- "master"
- "main"
jobs:
create_pr:
runs-on: ubuntu-18.04
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/copybara.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout a pull request from copybara to master
- name: Checkout a pull request from copybara to main
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
run: |
git config --global user.email "yoshi-code-bot@google.com"
git config --global user.name "Yoshi Code Bot"
gh pr create \
--base master \
--base main \
--head copybara \
--title "[Copybara] Update with new internal changes from Piper" \
--body "This is a auto-generated pull request. The PR updates the default branch with new changes from the copybara branch. Refer to PR commit history for more details."
2 changes: 1 addition & 1 deletion .github/workflows/gen_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ name: Run Generator and Create Pull Request
on:
push:
branches:
- "master"
- "main"
jobs:
create_pr:
runs-on: ubuntu-18.04
Expand Down
2 changes: 1 addition & 1 deletion proto/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The protos within this directory hierarchy represent the data within
events generated by Google eventing infrastructure, usually
represented as the [data
attribute](https://github.com/cloudevents/spec/blob/master/spec.md#event-data)
attribute](https://github.com/cloudevents/spec/blob/main/spec.md#event-data)
within a [CloudEvent](https://cloudevents.io/). They are provided as
machine-readable schemas, allowing libraries of data types to be
created to make it easier to consume events.
Expand Down

0 comments on commit 6707beb

Please sign in to comment.