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.

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

Rename master to main #592

Merged
merged 3 commits into from
Jul 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ notifications:

branches:
only:
- master
- main
- /^.*-ci$/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,8 @@ This library uses [semantic versioning](http://semver.org/). For each release, t
* This might work: `github_changelog_generator -u ably -p ably-java --header-label="# Changelog" --release-branch=release/1.2.1 --future-release=v1.2.1`
* But your mileage may vary as it can error. Perhaps more reliable is something like: `github_changelog_generator -u ably -p ably-java --since-tag v1.2.0 --output delta.md` and then manually merge the delta contents in to the main change log
4. Commit [CHANGELOG](./CHANGELOG.md)
5. Make a PR against `master`
6. Once the PR is approved, merge it into `master`
5. Make a PR against `main`
6. Once the PR is approved, merge it into `main`
7. Add a tag and push to origin - e.g.: `git tag v1.2.1 && git push origin v1.2.1`
8. Create the release on Github including populating the release notes (needed so JFrog can pull them in)
9. Assemble and Upload ([see below](#publishing-to-jcenter-and-maven-central) for details) - but the overall order to follow is:
Expand Down
2 changes: 1 addition & 1 deletion android/maven.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ uploadArchives {
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'https://raw.github.com/ably/ably-java/master/LICENSE'
url 'https://raw.github.com/ably/ably-java/main/LICENSE'
distribution 'repo'
}
}
Expand Down
2 changes: 1 addition & 1 deletion java/maven.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ uploadArchives {
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'https://raw.github.com/ably/ably-java/master/LICENSE'
url 'https://raw.github.com/ably/ably-java/main/LICENSE'
distribution 'repo'
}
}
Expand Down