Skip to content

Make the default branch main.#25

Merged
russtaylor merged 7 commits intomasterfrom
main-default-branch
Mar 1, 2021
Merged

Make the default branch main.#25
russtaylor merged 7 commits intomasterfrom
main-default-branch

Conversation

@russtaylor
Copy link
Copy Markdown
Member

Change the default branch for TryLib to main.

This is in an effort to deprecate the use of oppressive metaphors.

Please note, this may cause breaking changes if the repositories on which you use TryLib have not updated their default branches from master to main.

@russtaylor russtaylor requested a review from a team as a code owner February 18, 2021 22:13
Comment thread .phpunit.result.cache Outdated
@@ -0,0 +1 @@
C:37:"PHPUnit\Runner\DefaultTestResultCache":9696:{a:2:{s:7:"defects";a:15:{s:104:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPrintJobResultSuccessAndShowProgress with data set #0";i:6;s:104:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPrintJobResultSuccessAndShowProgress with data set #1";i:6;s:104:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPrintJobResultSuccessAndShowProgress with data set #2";i:6;s:90:"tests\phpunit\JenkinsRunner\MasterProjectTest::testProcessLogOutputNotFinishedShowProgress";i:6;s:87:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPollForCompletionJobPollsAndFinishes";i:6;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #0";i:6;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #1";i:6;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #2";i:6;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #3";i:6;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #4";i:6;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #5";i:6;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #6";i:6;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #7";i:6;s:82:"tests\phpunit\RepoManager\GitTest::testGetRemoteBranchNoTrackingRemoteWithSameName";i:6;s:72:"tests\phpunit\RepoManager\GitTest::testGetRemoteBranchNoTrackingNoRemote";i:6;}s:5:"times";a:88:{s:69:"tests\phpunit\JenkinsRunner\FreeStyleProjectTest::testGetBuildCommand";d:0.007000000000000000145716771982051795930601656436920166015625;s:93:"tests\phpunit\JenkinsRunner\FreeStyleProjectTest::testGetBuildExtraArguments with data set #0";d:0;s:93:"tests\phpunit\JenkinsRunner\FreeStyleProjectTest::testGetBuildExtraArguments with data set #1";d:0;s:93:"tests\phpunit\JenkinsRunner\FreeStyleProjectTest::testGetBuildExtraArguments with data set #2";d:0;s:93:"tests\phpunit\JenkinsRunner\FreeStyleProjectTest::testGetBuildExtraArguments with data set #3";d:0;s:88:"tests\phpunit\JenkinsRunner\FreeStyleProjectTest::testPollForCompletion with data set #0";d:0.00200000000000000004163336342344337026588618755340576171875;s:88:"tests\phpunit\JenkinsRunner\FreeStyleProjectTest::testPollForCompletion with data set #1";d:0;s:88:"tests\phpunit\JenkinsRunner\FreeStyleProjectTest::testPollForCompletion with data set #2";d:0;s:78:"tests\phpunit\JenkinsRunner\MasterProjectTest::testGetJobList with data set #0";d:0;s:78:"tests\phpunit\JenkinsRunner\MasterProjectTest::testGetJobList with data set #1";d:0;s:78:"tests\phpunit\JenkinsRunner\MasterProjectTest::testGetJobList with data set #2";d:0;s:78:"tests\phpunit\JenkinsRunner\MasterProjectTest::testGetJobList with data set #3";d:0;s:78:"tests\phpunit\JenkinsRunner\MasterProjectTest::testGetJobList with data set #4";d:0;s:78:"tests\phpunit\JenkinsRunner\MasterProjectTest::testGetJobList with data set #5";d:0;s:104:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPrintJobResultSuccessAndShowProgress with data set #0";d:0.001000000000000000020816681711721685132943093776702880859375;s:104:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPrintJobResultSuccessAndShowProgress with data set #1";d:0;s:104:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPrintJobResultSuccessAndShowProgress with data set #2";d:0;s:72:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPrintJobResultNoMatch";d:0;s:90:"tests\phpunit\JenkinsRunner\MasterProjectTest::testProcessLogOutputNotFinishedShowProgress";d:0;s:95:"tests\phpunit\JenkinsRunner\MasterProjectTest::testProcessLogOutputNotFinishedDoNotShowProgress";d:0;s:87:"tests\phpunit\JenkinsRunner\MasterProjectTest::testProcessLogOutputFinishedShowProgress";d:0.001000000000000000020816681711721685132943093776702880859375;s:92:"tests\phpunit\JenkinsRunner\MasterProjectTest::testProcessLogOutputFinishedDoNotShowProgress";d:0;s:107:"tests\phpunit\JenkinsRunner\MasterProjectTest::testProcessLogOutputDifferentPrefixFinishedDoNotShowProgress";d:0;s:82:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPollForCompletionJobUrlNotFound";d:0.007000000000000000145716771982051795930601656436920166015625;s:79:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPollForCompletionJobFinished";d:0;s:87:"tests\phpunit\JenkinsRunner\MasterProjectTest::testPollForCompletionJobPollsAndFinishes";d:0;s:47:"tests\phpunit\JenkinsRunnerTest::testInvalidUrl";d:0.003000000000000000062450045135165055398829281330108642578125;s:54:"tests\phpunit\JenkinsRunnerTest::testRunJenkinsCommand";d:0;s:45:"tests\phpunit\JenkinsRunnerTest::testSetParam";d:0;s:54:"tests\phpunit\JenkinsRunnerTest::testSetDuplicateParam";d:0;s:56:"tests\phpunit\JenkinsRunnerTest::testSetSshKeyFileExists";d:0.001000000000000000020816681711721685132943093776702880859375;s:63:"tests\phpunit\JenkinsRunnerTest::testSetSshKeyFileDoesNotExists";d:0;s:52:"tests\phpunit\JenkinsRunnerTest::testPatchFileExists";d:0;s:59:"tests\phpunit\JenkinsRunnerTest::testPatchFileDoesNotExists";d:0;s:52:"tests\phpunit\JenkinsRunnerTest::testAddNullCallback";d:0;s:54:"tests\phpunit\JenkinsRunnerTest::testAddStringCallback";d:0;s:50:"tests\phpunit\JenkinsRunnerTest::testAddObjallback";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testExecuteCallback with data set #0";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testExecuteCallback with data set #1";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testExecuteCallback with data set #2";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testExecuteCallback with data set #3";d:0;s:60:"tests\phpunit\JenkinsRunnerTest::testBuildCLICommandNoSshKey";d:0;s:62:"tests\phpunit\JenkinsRunnerTest::testBuildCLICommandWithSshKey";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #0";d:0.001000000000000000020816681711721685132943093776702880859375;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #1";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #2";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #3";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #4";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #5";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #6";d:0;s:69:"tests\phpunit\JenkinsRunnerTest::testStartJenkinsJob with data set #7";d:0;s:85:"tests\phpunit\Precheck\GitCopyAgeTest::testGetLastFetchDateWithoutRemoteBranchSuccess";d:0.001000000000000000020816681711721685132943093776702880859375;s:82:"tests\phpunit\Precheck\GitCopyAgeTest::testGetLastFetchDateWithRemoteBranchFailure";d:0;s:72:"tests\phpunit\Precheck\GitCopyAgeTest::testWorkingCopyPastMaxBlockingAge";d:0.001000000000000000020816681711721685132943093776702880859375;s:71:"tests\phpunit\Precheck\GitCopyAgeTest::testWorkingCopyPastMaxWarningAge";d:0;s:61:"tests\phpunit\Precheck\GitCopyAgeTest::testWorkingCopySuccess";d:0.0109999999999999993616217608405349892564117908477783203125;s:69:"tests\phpunit\Precheck\GitCopyBehindTest::testShouldRunCheckShouldRun";d:0;s:72:"tests\phpunit\Precheck\GitCopyBehindTest::testShouldRunCheckShouldNotRun";d:0;s:70:"tests\phpunit\Precheck\GitCopyBehindTest::testShouldRunCheckNoBranches";d:0;s:68:"tests\phpunit\Precheck\GitCopyBehindTest::testCheckWorkingCopyBehind";d:0;s:71:"tests\phpunit\Precheck\GitCopyBehindTest::testCheckWorkingCopyNotBehind";d:0;s:63:"tests\phpunit\Precheck\GitCopyBehindTest::testCheckShouldNotRun";d:0;s:62:"tests\phpunit\Precheck\GitWarnOnBlocklistedTest::testNoChanges";d:0;s:71:"tests\phpunit\Precheck\GitWarnOnBlocklistedTest::testNoBlockListedFiles";d:0;s:73:"tests\phpunit\Precheck\GitWarnOnBlocklistedTest::testWithBlockListedFiles";d:0;s:72:"tests\phpunit\Precheck\GitWarnOnBlocklistedTest::testWithSafeListedFiles";d:0;s:86:"tests\phpunit\Precheck\GitWarnOnBlocklistedTest::testWithSafeListedAndBlockListedFiles";d:0;s:63:"tests\phpunit\Precheck\GitWarnOnBlocklistedTest::testStagedOnly";d:0;s:64:"tests\phpunit\Precheck\ScriptRunnerTest::testScriptDoesNotExists";d:0;s:68:"tests\phpunit\Precheck\ScriptRunnerTest::testScriptExistsAndSucceeds";d:0;s:65:"tests\phpunit\Precheck\ScriptRunnerTest::testScriptExistsAndFails";d:0;s:68:"tests\phpunit\RepoManager\GitTest::testGenerateDiffStagedSuccessfull";d:0.001000000000000000020816681711721685132943093776702880859375;s:58:"tests\phpunit\RepoManager\GitTest::testGenerateDiffFailure";d:0;s:62:"tests\phpunit\RepoManager\GitTest::testParseLocalBranchSuccess";d:0;s:62:"tests\phpunit\RepoManager\GitTest::testParseLocalBranchFailure";d:0;s:55:"tests\phpunit\RepoManager\GitTest::testGetRemoteSuccess";d:0;s:63:"tests\phpunit\RepoManager\GitTest::testGetRemoteFailWithDefault";d:0;s:61:"tests\phpunit\RepoManager\GitTest::testGetRemoteFailNoDefault";d:0;s:72:"tests\phpunit\RepoManager\GitTest::testGetRemoteBranchFromTrackingConfig";d:0;s:82:"tests\phpunit\RepoManager\GitTest::testGetRemoteBranchNoTrackingRemoteWithSameName";d:0;s:72:"tests\phpunit\RepoManager\GitTest::testGetRemoteBranchNoTrackingNoRemote";d:0;s:46:"tests\phpunit\TryRunner\RunnerTest::testSimple";d:0.00899999999999999931998839741709161899052560329437255859375;s:57:"tests\phpunit\TryRunner\RunnerTest::testHonorRemoteBranch";d:0.00600000000000000012490009027033011079765856266021728515625;s:77:"tests\phpunit\Util\OptionsUtilTest::testParseExtraParameters with data set #0";d:0;s:77:"tests\phpunit\Util\OptionsUtilTest::testParseExtraParameters with data set #1";d:0;s:77:"tests\phpunit\Util\OptionsUtilTest::testParseExtraParameters with data set #2";d:0;s:77:"tests\phpunit\Util\OptionsUtilTest::testParseExtraParameters with data set #3";d:0;s:77:"tests\phpunit\Util\OptionsUtilTest::testParseExtraParameters with data set #4";d:0;}}} No newline at end of file
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add this file to .gitignore?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, good call! I did not mean to add this to the PR.

@russtaylor russtaylor merged commit 350ec61 into master Mar 1, 2021
@russtaylor russtaylor deleted the main-default-branch branch March 1, 2021 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants