Skip to content

Commit

Permalink
Rename master branch to main.
Browse files Browse the repository at this point in the history
  • Loading branch information
ychescale9 committed Jun 18, 2020
1 parent 52ecc4f commit b765743
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .buildscript/deploy_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# https://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci/

SLUG="ReactiveCircus/FlowBinding"
BRANCH="master"
BRANCH="main"

set -e

Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ workflows:
- publish_artifacts:
filters:
branches:
only: master
only: main
requires:
- build_and_test
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
connected_check_task:
name: Run Android instrumented tests (API $API_LEVEL)
timeout_in: 30m
only_if: $CIRRUS_BRANCH == "master" || CIRRUS_PR != ""
only_if: $CIRRUS_BRANCH == "main" || CIRRUS_PR != ""
skip: "!changesInclude('.cirrus.yml', '*.gradle', '*.gradle.kts', '**/*.gradle', '**/*.gradle.kts', '*.properties', '**/*.properties', '**/*.kt', '**/*.xml')"
env:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy Website
on:
push:
branches:
- master
- main
paths:
- '**.md'
- 'mkdocs.yml'
Expand Down
4 changes: 2 additions & 2 deletions gradle/buildCacheSettings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext.isCiServer = System.getenv().containsKey("CIRRUS_CI")
ext.isMasterBranch = System.getenv()["CIRRUS_BRANCH"] == "master"
ext.isMainBranch = System.getenv()["CIRRUS_BRANCH"] == "main"
ext.buildCacheHost = System.getenv().getOrDefault("CIRRUS_HTTP_CACHE_HOST", "localhost:12321")

/**
Expand All @@ -12,6 +12,6 @@ buildCache {
remote(HttpBuildCache) {
url = "http://${buildCacheHost}/"
enabled = isCiServer
push = isMasterBranch
push = isMainBranch
}
}

0 comments on commit b765743

Please sign in to comment.