Skip to content

Commit

Permalink
Rename default branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
OndraM committed Jun 13, 2020
1 parent 0babf1c commit 5bf171f
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CI Detector

[![Latest Stable Version](https://img.shields.io/packagist/v/ondram/ci-detector.svg?style=flat-square)](https://packagist.org/packages/ondram/ci-detector)
[![Coverage Status](https://img.shields.io/coveralls/OndraM/ci-detector/master.svg?style=flat-square)](https://coveralls.io/r/OndraM/ci-detector)
[![Coverage Status](https://img.shields.io/coveralls/OndraM/ci-detector/main.svg?style=flat-square)](https://coveralls.io/r/OndraM/ci-detector)
[![GitHub Actions Build Status](https://img.shields.io/github/workflow/status/OndraM/ci-detector/PHP?style=flat-square&label=GitHub%20Actions%20build)](https://github.com/OndraM/ci-detector/actions)
[![Travis Build Status](https://img.shields.io/travis/OndraM/ci-detector.svg?style=flat-square&label=Travis%20build)](https://travis-ci.org/OndraM/ci-detector)
[![AppVeyor Build Status](https://img.shields.io/appveyor/ci/OndraM/ci-detector.svg?style=flat-square&label=AppVeyor%20build)](https://ci.appveyor.com/project/OndraM/ci-detector)
Expand Down
2 changes: 1 addition & 1 deletion tests/phpt/Ci/CiDetector_AppVeyorPullRequest.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH=feature/pr-branch
APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME=foo/ci-detector
APPVEYOR_PULL_REQUEST_NUMBER=42
APPVEYOR_PULL_REQUEST_TITLE=Foo bar PR title
APPVEYOR_REPO_BRANCH=master
APPVEYOR_REPO_BRANCH=main
[email protected]
APPVEYOR_REPO_COMMIT_AUTHOR=foo
APPVEYOR_REPO_COMMIT_MESSAGE=Foo bar PR commit message
Expand Down
18 changes: 9 additions & 9 deletions tests/phpt/Ci/CiDetector_Bamboo.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,26 @@ BAMBOO_JMS_CONNECTION_PORT=54663
bamboo_plan_storageTag=plan-589829
bamboo_planKey=CD-CDOB
bamboo_planName=Plan Name - Foo Lorem ipsum
bamboo_planRepository_1_branch=master
bamboo_planRepository_1_branchDisplayName=master
bamboo_planRepository_1_branchName=master
bamboo_planRepository_1_branch=main
bamboo_planRepository_1_branchDisplayName=main
bamboo_planRepository_1_branchName=main
bamboo_planRepository_1_name=My repo name
bamboo_planRepository_1_repositoryUrl=ssh://[email protected]/foo/ci-detector
bamboo_planRepository_1_revision=4e7f5fcf7802369224dba2095551c35e1e389551
bamboo_planRepository_1_type=bbCloud
bamboo_planRepository_1_username=
bamboo_planRepository_branch=master
bamboo_planRepository_branchDisplayName=master
bamboo_planRepository_branchName=master
bamboo_planRepository_branch=main
bamboo_planRepository_branchDisplayName=main
bamboo_planRepository_branchName=main
bamboo_planRepository_name=My repo name
bamboo_planRepository_repositoryUrl=ssh://[email protected]/foo/ci-detector
bamboo_planRepository_revision=4e7f5fcf7802369224dba2095551c35e1e389551
bamboo_planRepository_type=bbCloud
bamboo_planRepository_username=
bamboo_repository_524293_branch_name=master
bamboo_repository_524293_branch_name=main
bamboo_repository_524293_name=My repo name
bamboo_repository_524293_revision_number=4e7f5fcf7802369224dba2095551c35e1e389551
bamboo_repository_branch_name=master
bamboo_repository_branch_name=main
bamboo_repository_name=My repo name
bamboo_repository_revision_number=4e7f5fcf7802369224dba2095551c35e1e389551
bamboo_resultsUrl=https://bamboo.foo.bar/browse/CD-CDOB-JOB1-1
Expand Down Expand Up @@ -102,7 +102,7 @@ string(44) "https://bamboo.foo.bar/browse/CD-CDOB-JOB1-1"
Git commit:
string(40) "4e7f5fcf7802369224dba2095551c35e1e389551"
Git branch:
string(6) "master"
string(4) "main"
Repository name:
string(12) "My repo name"
Repository url:
Expand Down
2 changes: 1 addition & 1 deletion tests/phpt/Ci/CiDetector_BambooPullRequest.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ bamboo_repository_branch_name=pr-branch
bamboo_repository_name=My repo name
bamboo_repository_pr_key=1
bamboo_repository_pr_sourceBranch=pr-branch
bamboo_repository_pr_targetBranch=master
bamboo_repository_pr_targetBranch=main
bamboo_repository_previous_revision_number=d05c681b5018c8ce8110ee7823a56b688ca67aa1
bamboo_repository_revision_number=d05c681b5018c8ce8110ee7823a56b688ca67aa1
bamboo_resultsUrl=https://bamboo.foo.bar/browse/CD-CDOB0-JOB1-1
Expand Down
4 changes: 2 additions & 2 deletions tests/phpt/Ci/CiDetector_BitbucketPipelines.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Bitbucket Pipelines: Detect properties

--ENV--
BITBUCKET_BRANCH=master
BITBUCKET_BRANCH=main
BITBUCKET_BUILD_NUMBER=5
BITBUCKET_CLONE_DIR=/opt/atlassian/pipelines/agent/build
BITBUCKET_COMMIT=c4f71a535de986600303936780f815721ebbe0c5
Expand Down Expand Up @@ -66,7 +66,7 @@ string(80) "http://bitbucket.org/ondrejmachulda/ci-detector/addon/pipelines/home
Git commit:
string(40) "c4f71a535de986600303936780f815721ebbe0c5"
Git branch:
string(6) "master"
string(4) "main"
Repository name:
string(26) "ondrejmachulda/ci-detector"
Repository url:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ BITBUCKET_COMMIT=8d081548cabb
BITBUCKET_DOCKER_HOST_INTERNAL=10.39.145.17
BITBUCKET_GIT_HTTP_ORIGIN=http://bitbucket.org/ondrejmachulda/ci-detector
[email protected]:ondrejmachulda/ci-detector.git
BITBUCKET_PR_DESTINATION_BRANCH=master
BITBUCKET_PR_DESTINATION_BRANCH=main
BITBUCKET_PR_DESTINATION_COMMIT=88a27cd7f221
BITBUCKET_PR_ID=2
BITBUCKET_PROJECT_KEY=CD
Expand Down
6 changes: 3 additions & 3 deletions tests/phpt/Ci/CiDetector_Buddy.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Buddy: Detect properties

--ENV--
BUDDY_EXECUTION_BRANCH=master
BUDDY_EXECUTION_BRANCH=main
BUDDY_EXECUTION_CHANGELOG=[e5e13f8] Create buddy.yml | mikebenson | 2019-01-01T07:14:58
BUDDY_EXECUTION_CLEAR_CACHE=false
BUDDY_EXECUTION_COMMENT=My first execution
Expand All @@ -27,7 +27,7 @@ BUDDY_INVOKER_NAME=Mike Benson
BUDDY_INVOKER_URL=https://app.buddy.works/myworkspace/profile/1
BUDDY_PIPELINE_ID=1
BUDDY_PIPELINE_NAME=Deploy to Production
BUDDY_PIPELINE_REF_NAME=master
BUDDY_PIPELINE_REF_NAME=main
BUDDY_PIPELINE_TARGET_SITE_URL=https://buddy.works/
BUDDY_PIPELINE_TRIGGER_MODE=MANUAL
BUDDY_PIPELINE_URL=https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/1
Expand Down Expand Up @@ -88,7 +88,7 @@ string(102) "https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/1
Git commit:
string(40) "e5e13f8b7f8d5c6096a0501dc09b48eef05fea96"
Git branch:
string(6) "master"
string(4) "main"
Repository name:
string(21) "buddyworks/my-project"
Repository url:
Expand Down
6 changes: 3 additions & 3 deletions tests/phpt/Ci/CiDetector_BuddyPullRequest.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
Buddy: Detect properties of PR build

--ENV--
BUDDY_EXECUTION_BRANCH=master
BUDDY_EXECUTION_BRANCH=main
BUDDY_EXECUTION_CHANGELOG=[e5e13f8] Create buddy.yml | mikebenson | 2019-01-01T07:14:58
BUDDY_EXECUTION_CLEAR_CACHE=false
BUDDY_EXECUTION_COMMENT=My first execution
BUDDY_EXECUTION_ID=1
BUDDY_EXECUTION_MODE=MANUAL
BUDDY_EXECUTION_PULL_REQUEST_BASE_BRANCH=master
BUDDY_EXECUTION_PULL_REQUEST_BASE_BRANCH=main
BUDDY_EXECUTION_PULL_REQUEST_HEAD_BRANCH=feature/pr-branch
BUDDY_EXECUTION_PULL_REQUEST_ID=pull/1
BUDDY_EXECUTION_PULL_REQUEST_NO=1
Expand All @@ -31,7 +31,7 @@ BUDDY_INVOKER_NAME=Mike Benson
BUDDY_INVOKER_URL=https://app.buddy.works/myworkspace/profile/1
BUDDY_PIPELINE_ID=1
BUDDY_PIPELINE_NAME=Deploy to Production
BUDDY_PIPELINE_REF_NAME=master
BUDDY_PIPELINE_REF_NAME=main
BUDDY_PIPELINE_TARGET_SITE_URL=https://buddy.works/
BUDDY_PIPELINE_TRIGGER_MODE=MANUAL
BUDDY_PIPELINE_URL=https://app.buddy.works/myworkspace/my-project/pipelines/pipeline/1
Expand Down
2 changes: 1 addition & 1 deletion tests/phpt/Ci/CiDetector_GitHubActionsPullRequest.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
GITHUB_ACTION=run333
GITHUB_ACTIONS=true
GITHUB_ACTOR=OndraM
GITHUB_BASE_REF=master
GITHUB_BASE_REF=main
GITHUB_EVENT_NAME=pull_request
GITHUB_EVENT_PATH=/home/runner/work/_temp/_github_workflow/event.json
GITHUB_HEAD_REF=feature/pr-branch
Expand Down
2 changes: 1 addition & 1 deletion tests/phpt/Ci/CiDetector_TeamCity.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TeamCity: Detect properties

--ENV--
BUILD_NUMBER=5
BUILD_VCS_NUMBER_CiDetector_HttpsGithubComOndraMCiDetectorRefsHeadsMaster=1ee546f280c093f1e24ecc149db4a0a100c8d609
BUILD_VCS_NUMBER_CiDetector_HttpsGithubComOndraMCiDetectorRefsHeadsMain=1ee546f280c093f1e24ecc149db4a0a100c8d609
BUILD_VCS_NUMBER=1ee546f280c093f1e24ecc149db4a0a100c8d609
HOSTNAME=d4df8dab12df
TEAMCITY_BUILD_PROPERTIES_FILE=/opt/TeamCity/buildAgent/temp/buildTmp/teamcity.build7945248142905164474.properties
Expand Down
2 changes: 1 addition & 1 deletion tests/phpt/Ci/CiDetector_TravisPullRequest.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CI=true
CONTINUOUS_INTEGRATION=true
HAS_ANTARES_THREE_LITTLE_FRONZIES_BADGE=true
HAS_JOSH_K_SEAL_OF_APPROVAL=true
TRAVIS_BRANCH=master
TRAVIS_BRANCH=main
TRAVIS_BUILD_DIR=/home/travis/build/OndraM/ci-detector
TRAVIS_BUILD_ID=148395135
TRAVIS_BUILD_NUMBER=1
Expand Down

0 comments on commit 5bf171f

Please sign in to comment.