Skip to content

Commit e6d4579

Browse files
committed
Update master to main
1 parent dae38ef commit e6d4579

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ name: build
66
on:
77
push:
88
branches:
9-
- master
9+
- main
1010
- 'release/**'
1111
pull_request:
1212
branches:
13-
- master
13+
- main
1414
- 'release/**'
1515
workflow_dispatch:
1616

@@ -34,7 +34,7 @@ jobs:
3434
- name: Build with Gradle
3535
run: ./gradlew build
3636
deploy:
37-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
37+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
3838
name: Deploy SNAPSHOT
3939
runs-on: ubuntu-latest
4040
steps:

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ "master" ]
16+
branches: [ "main" ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ "master" ]
19+
branches: [ "main" ]
2020
schedule:
2121
- cron: '34 22 * * 1'
2222

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ We welcome contributions to this project by both internal and external parties
1010
1. Ensure you commit message is descriptive as it acts as the changelog. Mark any breaking changes with `BREAKING`.
1111
Include a rectification strategy if you introduce a `BREAKING` change.
1212
1. Ensure `README.md` is updated if needed. All code samples in the README should have corresponding (actual sames) in the various docs/ folders
13-
1. Submit a pull request back to `master` branch (or the branch you are contributing to)
13+
1. Submit a pull request back to `main` branch (or the branch you are contributing to)
1414
1. Ensure Github Actions build passes
1515
1. Await reviews
16-
1. Once merged into `master` a `SNAPSHOT` build will be available for consumption
16+
1. Once merged into `main` a `SNAPSHOT` build will be available for consumption
1717
immediately [here](https://oss.sonatype.org/content/repositories/snapshots/io/github/codedabble-dev/). Note that
1818
snapshots change regularly and cannot be relied upon.
1919
1. Hard Releases will be made once enough features have been added.
@@ -81,6 +81,6 @@ export ORG_GRADLE_PROJECT_signingPassword=?
8181

8282
## Cleanup
8383

84-
1. Checkout master branch
84+
1. Checkout main branch
8585
1. Increment version number in `gradle.properties`
8686
1. Create pull request for merge

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public class JUnit4RulesExample {
346346
}
347347
```
348348

349-
See the [ParameterizedTest](https://github.com/codedabble-dev/java-snapshot-testing/blob/master/java-snapshot-testing-junit4/src/test/java/au/com/origin/snapshots/ParameterizedTest.java) for an example implementation
349+
See the [ParameterizedTest](https://github.com/codedabble-dev/java-snapshot-testing/blob/main/java-snapshot-testing-junit4/src/test/java/au/com/origin/snapshots/ParameterizedTest.java) for an example implementation
350350

351351
## [Spock](http://spockframework.org/)
352352

0 commit comments

Comments
 (0)