Skip to content

Commit

Permalink
Merge pull request #229 from mkurz/rename_main
Browse files Browse the repository at this point in the history
Rename master branch to main
  • Loading branch information
mkurz authored Feb 6, 2022
2 parents 9f400f9 + 5bacc1a commit 5e26860
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- master
- main

jobs:
update_release_draft:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stages:
- name: jacoco
- name: test
- name: release
if: ((branch = master AND type = push) OR (tag IS present)) AND NOT fork
if: ((branch = main AND type = push) OR (tag IS present)) AND NOT fork

jobs:
include:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# play-ebean

[![Build Status](https://travis-ci.com/playframework/play-ebean.svg?branch=master)](https://travis-ci.com/playframework/play-ebean)
[![Build Status](https://travis-ci.com/playframework/play-ebean.svg?branch=main)](https://travis-ci.com/playframework/play-ebean)
[![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/play-ebean_2.12.svg)](http://mvnrepository.com/artifact/com.typesafe.play/play-ebean_2.12)

This module provides Ebean support for Play Framework.
Expand Down
4 changes: 2 additions & 2 deletions RELEASING.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Releasing

This is released from the `master` branch unless it is a version older than `6.1.0`. If there is no branch for the
This is released from the `main` branch unless it is a version older than `6.1.0`. If there is no branch for the
release that needs patching, create it from the tag.

## Cutting the release

### Requires contributor access

- Check the [draft release notes](https://github.com/playframework/play-ebean/releases) to see if everything is there
- Wait until [master build finished](https://travis-ci.com/github/playframework/play-ebean/builds) after merging the
- Wait until [main build finished](https://travis-ci.com/github/playframework/play-ebean/builds) after merging the
last PR
- Update the [draft release](https://github.com/playframework/play-ebean/releases) with the next tag version
(eg. `7.0.0`), title and release description
Expand Down

0 comments on commit 5e26860

Please sign in to comment.