Skip to content

Commit

Permalink
Merge branch 'main' into ResourceMergePrecedence
Browse files Browse the repository at this point in the history
  • Loading branch information
cijothomas authored Jan 27, 2021
2 parents 313de3e + 01dd4ab commit 0050c1b
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docfx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: docfx

on:
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-core-cov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Code Coverage

on:
push:
branches: [ master ]
branches: [ main ]
paths-ignore:
- '**.md'
pull_request:
branches: [ master ]
branches: [ main ]
paths-ignore:
- '**.md'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-core-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Linux

on:
pull_request:
branches: [ master ]
branches: [ main ]
paths-ignore:
- '**.md'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-core-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Windows

on:
pull_request:
branches: [ master ]
branches: [ main ]
paths-ignore:
- '**.md'

Expand All @@ -16,7 +16,7 @@ jobs:

steps:
- uses: actions/checkout@v2

- name: Setup .NET Core 2.1
uses: actions/setup-dotnet@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: dotnet format

on:
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '**.cs'
- '.editorconfig'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Integration Tests

on:
push:
branches: [ master ]
branches: [ main ]
paths-ignore:
- '**.md'
pull_request:
branches: [ master ]
branches: [ main ]
paths-ignore:
- '**.md'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: markdownlint

on:
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '**.md'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sanitycheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: sanitycheck

on:
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
misspell:
Expand Down

0 comments on commit 0050c1b

Please sign in to comment.