Skip to content
This repository has been archived by the owner on Oct 21, 2023. It is now read-only.

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed Feb 5, 2022
1 parent 99506d1 commit 935901b
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name: Release Drafter
on:
push:
branches:
- master
- main

jobs:
update_release_draft:
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -33,14 +33,14 @@ pull_request_rules:
label:
remove: [status:needs-backport-1.3]

- name: forward patches to master branch
- name: forward patches to main branch
conditions:
- merged
- label=status:needs-forwardport
actions:
backport:
branches:
- master
- main
label:
remove: [status:needs-forwardport]

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ stages:
- name: check

- name: publish
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

cache:
directories:
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

Interplay is a set of sbt plugins for Play builds, sharing common configuration between Play builds so that they can be configured in one place.

[![Build Status](https://travis-ci.org/playframework/interplay.svg?branch=master)](https://travis-ci.org/playframework/interplay)
[![Build Status](https://travis-ci.org/playframework/interplay.svg?branch=main)](https://travis-ci.org/playframework/interplay)

## Usage

2 changes: 1 addition & 1 deletion src/main/scala/interplay/Omnidoc.scala
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ object Omnidoc extends AutoPlugin {

override def projectSettings = Seq(
omnidocSourceUrl := omnidocGithubRepo.?.value map { repo =>
val development: String = (omnidocSnapshotBranch ?? "master").value
val development: String = (omnidocSnapshotBranch ?? "main").value
val tagged: String = (omnidocTagPrefix ?? "v").value + version.value
val tree: String = if (isSnapshot.value) development else tagged
val prefix: String = "/" + (omnidocPathPrefix ?? "").value
4 changes: 2 additions & 2 deletions src/main/scala/interplay/PlayBuildBase.scala
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ object PlayBuildBase extends AutoPlugin {

// This is not using sbt-git because we need a more stable way to set
// the current branch in a more stable way, for example, we may want to
// get the current branch as "master" even if we are at a detached commit.
// get the current branch as "main" even if we are at a detached commit.
//
// This is useful when running tasks on Travis, where the builds runs in
// a detached commit. See the discussion here:
@@ -93,7 +93,7 @@ object PlayBuildBase extends AutoPlugin {
} orElse {
sys.props.get("currentBranch")
} getOrElse {
"master"
"main"
},

pomExtra := {
2 changes: 1 addition & 1 deletion src/sbt-test/interplay/library/build.sbt
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ InputKey[Unit]("contains") := {
TaskKey[Unit]("verifyOmnidocSourceUrl") := {
import java.util.jar.JarFile

val expected = "https://github.com/playframework/mock/tree/master"
val expected = "https://github.com/playframework/mock/tree/main"

val sourceUrl = omnidocSourceUrl.value
sourceUrl match {

0 comments on commit 935901b

Please sign in to comment.