diff --git a/app/Http/Controllers/BuildController.php b/app/Http/Controllers/BuildController.php index 58eb1a5e7a..bcc1a1c650 100644 --- a/app/Http/Controllers/BuildController.php +++ b/app/Http/Controllers/BuildController.php @@ -35,7 +35,7 @@ final class BuildController extends AbstractBuildController { - public function errors(Request $request, int $build_id): View + public function build(Request $request, int $build_id): View { $this->setBuildById($build_id); @@ -58,7 +58,7 @@ public function errors(Request $request, int $build_id): View } } - return $this->vue('build-errors-page', 'Build Errors', $params); + return $this->vue('build-build-page', 'Build', $params); } public function commands(int $build_id): View diff --git a/app/Utils/RepositoryUtils.php b/app/Utils/RepositoryUtils.php index d1e6c9523b..c0448042ed 100644 --- a/app/Utils/RepositoryUtils.php +++ b/app/Utils/RepositoryUtils.php @@ -544,7 +544,7 @@ private static function get_email_summary(int $buildid, array $errors, $errorkey foreach ($errors as $error) { $info = ''; if (strlen($error->sourcefile) > 0) { - $info .= "{$error->sourcefile} line {$error->sourceline} ({$serverURI}/builds/{$buildid}/errors)"; + $info .= "{$error->sourcefile} line {$error->sourceline} ({$serverURI}/builds/{$buildid}/build)"; $info .= "{$error->stderror}\n"; } else { $info .= "{$error->stderror}\n"; @@ -564,7 +564,7 @@ private static function get_email_summary(int $buildid, array $errors, $errorkey foreach ($failures as $fail) { $info = ''; if (strlen($fail->sourcefile) > 0) { - $info .= "{$fail->sourcefile} ({$serverURI}/builds/{$buildid}/errors)\n"; + $info .= "{$fail->sourcefile} ({$serverURI}/builds/{$buildid}/build)\n"; } if (strlen($fail->stdoutput) > 0) { $info .= "{$fail->stdoutput}\n"; @@ -592,7 +592,7 @@ private static function get_email_summary(int $buildid, array $errors, $errorkey foreach ($warnings as $warning) { $info = ''; if (strlen($warning->sourcefile) > 0) { - $info .= "{$warning->sourcefile} line {$warning->sourceline} ({$serverURI}/builds/{$buildid}/errors)\n"; + $info .= "{$warning->sourcefile} line {$warning->sourceline} ({$serverURI}/builds/{$buildid}/build)\n"; $info .= "{$warning->stderror}\n"; } else { $info .= "{$warning->stderror}\n"; @@ -614,7 +614,7 @@ private static function get_email_summary(int $buildid, array $errors, $errorkey foreach ($failures as $fail) { $info = ''; if (strlen($fail->sourcefile) > 0) { - $info .= "{$fail->sourcefile} ({$serverURI}/builds/{$buildid}/errors)\n"; + $info .= "{$fail->sourcefile} ({$serverURI}/builds/{$buildid}/build)\n"; } if (strlen($fail->stdoutput) > 0) { $info .= "{$fail->stdoutput}\n"; diff --git a/app/cdash/app/Lib/Repository/GitHub.php b/app/cdash/app/Lib/Repository/GitHub.php index 5e4778f50b..32383b1374 100644 --- a/app/cdash/app/Lib/Repository/GitHub.php +++ b/app/cdash/app/Lib/Repository/GitHub.php @@ -425,7 +425,7 @@ public function getCheckSummaryForBuildRow(array $row): ?string // Pluralize. $msg .= 's'; } - $details_url = "$this->baseUrl/builds/{$row['id']}/errors"; + $details_url = "$this->baseUrl/builds/{$row['id']}/build"; $icon = ':x:'; $this->numFailed++; $this->foundBuildErrors = true; diff --git a/app/cdash/app/Model/Build.php b/app/cdash/app/Model/Build.php index e5e22cf853..ab23b2fe7b 100644 --- a/app/cdash/app/Model/Build.php +++ b/app/cdash/app/Model/Build.php @@ -897,7 +897,7 @@ public function Save() if ($hasErrors) { $message = "$this->Name experienced errors"; - $url = url('/builds/' . $this->Id . '/errors'); + $url = url('/builds/' . $this->Id . '/build'); $this->NotifyPullRequest($message, $url); } } @@ -2297,7 +2297,7 @@ public function GetBuildSummaryUrl(): string public function GetBuildErrorUrl(): string { - return url('/builds/' . $this->Id . '/errors'); + return url('/builds/' . $this->Id . '/build'); } public function GetTestUrl(): string diff --git a/app/cdash/app/Model/BuildError.php b/app/cdash/app/Model/BuildError.php index b677affcfb..8b0f549eda 100644 --- a/app/cdash/app/Model/BuildError.php +++ b/app/cdash/app/Model/BuildError.php @@ -65,6 +65,6 @@ public function Insert(): void */ public function GetUrlForSelf(): string { - return url('/builds/' . $this->BuildId . '/errors'); + return url('/builds/' . $this->BuildId . '/build'); } } diff --git a/app/cdash/app/Model/BuildFailure.php b/app/cdash/app/Model/BuildFailure.php index a4481fe576..89d7f12ad7 100644 --- a/app/cdash/app/Model/BuildFailure.php +++ b/app/cdash/app/Model/BuildFailure.php @@ -170,6 +170,6 @@ public function GetBuildFailureArguments(int $buildFailureId): array /** Returns a self referencing URI for the current BuildFailure. */ public function GetUrlForSelf(): string { - return url('/builds/' . $this->BuildId . '/errors'); + return url('/builds/' . $this->BuildId . '/build'); } } diff --git a/app/cdash/tests/CMakeLists.txt b/app/cdash/tests/CMakeLists.txt index 0ec80ad976..13a9c8c16b 100644 --- a/app/cdash/tests/CMakeLists.txt +++ b/app/cdash/tests/CMakeLists.txt @@ -407,7 +407,7 @@ add_browser_test(/Browser/Pages/BuildTestsPageTest) add_browser_test(/Browser/Pages/BuildConfigurePageTest) -add_browser_test(/Browser/Pages/BuildErrorsPageTest) +add_browser_test(/Browser/Pages/BuildBuildPageTest) add_browser_test(/Browser/Pages/BuildCoveragePageTest) diff --git a/app/cdash/tests/autoremovebuilds/CMakeLists.txt b/app/cdash/tests/autoremovebuilds/CMakeLists.txt index 7a7a13bcfb..5d9b2f1520 100644 --- a/app/cdash/tests/autoremovebuilds/CMakeLists.txt +++ b/app/cdash/tests/autoremovebuilds/CMakeLists.txt @@ -20,7 +20,6 @@ set_property(TEST deletesubproject PROPERTY DEPENDS cypress/e2e/daterange cypress/e2e/sites cypress/e2e/tests - cypress/e2e/build-configure ) add_test( diff --git a/app/cdash/tests/case/CDash/Lib/Repository/GitHubTest.php b/app/cdash/tests/case/CDash/Lib/Repository/GitHubTest.php index 6a0e4a4f4a..22db7cc35d 100644 --- a/app/cdash/tests/case/CDash/Lib/Repository/GitHubTest.php +++ b/app/cdash/tests/case/CDash/Lib/Repository/GitHubTest.php @@ -108,7 +108,7 @@ public function testCheckSummaryForBuildRow(): void // Single build error. $build_row['builderrors'] = 1; - $link = "$this->baseUrl/builds/99999/errors"; + $link = "$this->baseUrl/builds/99999/build"; $actual = $sut->getCheckSummaryForBuildRow($build_row); $expected = $common . ":x: | [1 build error]($link)"; $this::assertEquals($expected, $actual); @@ -224,7 +224,7 @@ private function validateCheckPayloadFromBuildRows(): void $expected['output']['text'] = "$table_header\n"; $expected['output']['text'] .= "[a]($this->baseUrl/builds/99995) | :white_check_mark: | [success]($this->baseUrl/builds/99995)\n"; $expected['output']['text'] .= "[b]($this->baseUrl/builds/99996) | :x: | [5 configure errors]($this->baseUrl/builds/99996/configure)\n"; - $expected['output']['text'] .= "[c]($this->baseUrl/builds/99997) | :x: | [1 build error]($this->baseUrl/builds/99997/errors)\n"; + $expected['output']['text'] .= "[c]($this->baseUrl/builds/99997) | :x: | [1 build error]($this->baseUrl/builds/99997/build)\n"; $expected['output']['text'] .= "[d]($this->baseUrl/builds/99998) | :x: | [7 failed tests]($this->baseUrl/builds/99998/tests)"; $build_rows[] = [ 'name' => 'b', diff --git a/app/cdash/tests/test_issuecreation.php b/app/cdash/tests/test_issuecreation.php index 53a391113b..56fe9e9860 100644 --- a/app/cdash/tests/test_issuecreation.php +++ b/app/cdash/tests/test_issuecreation.php @@ -169,15 +169,15 @@ public function testIssueCreation(): void $answer_key = [ 'Buganizer' => [ - 'Standalone' => "https://buganizer.com/issues/new?component=123&template=456&type=BUG&priority=P0&severity=S0&title=FAILED+%28w%3D3%2C+t%3D6%2C+d%3D10%29%3A+IssueCreationProject+-+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug+-+Experimental&description=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid1}%0A%0AProject%3A+IssueCreationProject%0ASite%3A+camelot.kitware%0ABuild+Name%3A+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug%0ABuild+Time%3A+2009-02-23T07%3A10%3A38+UTC%0AType%3A+Experimental%0AWarnings%3A+3%0ATests+not+passing%3A+6%0ADynamic+analysis+tests+failing%3A+10%0A%0A%0A%2AWarnings%2A+%28first+1%29%0ATesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx+line+187+%28$encoded_base_url%2Fbuilds%2F{$buildid1}%2Ferrors%29%0A%5C...%5CSandbox%5CTesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx%3A187%3A+warning%3A+converting+to+%3C-30%3E%3C-128%3E%3C-104%3Emain%3A%3AInputPixelType%3C-30%3E%3C-128%3E%3C-103%3E+from+%3C-30%3E%3C-128%3E%3C-104%3Edouble%3C-30%3E%3C-128%3E%3C-103%3E%0A%0A%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0AitkVectorLevelSetFunctionTest2+%7C+Completed+%28OTHER_FAULT%29+%7C+%28$encoded_base_url%2Ftests%2F{$build1failedtestid}%29%0A%0A%0A%0A%2ATests+not+run%2A+%28first+1%29%0AitkVectorFiniteDifferenceFunctionTest1+%7C++%7C+%28$encoded_base_url%2Ftests%2F{$build1notruntestid}%29%0A%0A%0A%0A%2ADynamic+analysis+tests+failing+or+not+run%2A+%28first+1%29%0AitkGeodesicActiveContourLevelSetSegmentationModuleTest1+%28$encoded_base_url%2FviewDynamicAnalysisFile.php%3Fid%3D{$da_id}%29%0A%0A", + 'Standalone' => "https://buganizer.com/issues/new?component=123&template=456&type=BUG&priority=P0&severity=S0&title=FAILED+%28w%3D3%2C+t%3D6%2C+d%3D10%29%3A+IssueCreationProject+-+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug+-+Experimental&description=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid1}%0A%0AProject%3A+IssueCreationProject%0ASite%3A+camelot.kitware%0ABuild+Name%3A+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug%0ABuild+Time%3A+2009-02-23T07%3A10%3A38+UTC%0AType%3A+Experimental%0AWarnings%3A+3%0ATests+not+passing%3A+6%0ADynamic+analysis+tests+failing%3A+10%0A%0A%0A%2AWarnings%2A+%28first+1%29%0ATesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx+line+187+%28$encoded_base_url%2Fbuilds%2F{$buildid1}%2Fbuild%29%0A%5C...%5CSandbox%5CTesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx%3A187%3A+warning%3A+converting+to+%3C-30%3E%3C-128%3E%3C-104%3Emain%3A%3AInputPixelType%3C-30%3E%3C-128%3E%3C-103%3E+from+%3C-30%3E%3C-128%3E%3C-104%3Edouble%3C-30%3E%3C-128%3E%3C-103%3E%0A%0A%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0AitkVectorLevelSetFunctionTest2+%7C+Completed+%28OTHER_FAULT%29+%7C+%28$encoded_base_url%2Ftests%2F{$build1failedtestid}%29%0A%0A%0A%0A%2ATests+not+run%2A+%28first+1%29%0AitkVectorFiniteDifferenceFunctionTest1+%7C++%7C+%28$encoded_base_url%2Ftests%2F{$build1notruntestid}%29%0A%0A%0A%0A%2ADynamic+analysis+tests+failing+or+not+run%2A+%28first+1%29%0AitkGeodesicActiveContourLevelSetSegmentationModuleTest1+%28$encoded_base_url%2FviewDynamicAnalysisFile.php%3Fid%3D{$da_id}%29%0A%0A", 'SubProject' => "https://buganizer.com/issues/new?component=123&template=456&type=BUG&priority=P0&severity=S0&title=FAILED+%28t%3D1%29%3A+CDash%2FSubProject1+-+test_PR_comment+-+Experimental&description=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid2}%0A%0AProject%3A+CDash%0ASubProject%3A+SubProject1%0ASite%3A+elysium%0ABuild+Name%3A+test_PR_comment%0ABuild+Time%3A+2015-08-11T20%3A45%3A30+UTC%0AType%3A+Experimental%0ATests+not+passing%3A+1%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0Afoo+%7C+Completed+%28Failed%29+%7C+%28$encoded_base_url%2Ftests%2F{$build2failedtestid}%29%0A%0A", ], 'GitHub' => [ - 'Standalone' => "https://github.com/Kitware/CDash/issues/new?title=FAILED+%28w%3D3%2C+t%3D6%2C+d%3D10%29%3A+IssueCreationProject+-+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug+-+Experimental&body=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid1}%0A%0AProject%3A+IssueCreationProject%0ASite%3A+camelot.kitware%0ABuild+Name%3A+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug%0ABuild+Time%3A+2009-02-23T07%3A10%3A38+UTC%0AType%3A+Experimental%0AWarnings%3A+3%0ATests+not+passing%3A+6%0ADynamic+analysis+tests+failing%3A+10%0A%0A%0A%2AWarnings%2A+%28first+1%29%0ATesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx+line+187+%28$encoded_base_url%2Fbuilds%2F{$buildid1}%2Ferrors%29%0A%5C...%5CSandbox%5CTesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx%3A187%3A+warning%3A+converting+to+%3C-30%3E%3C-128%3E%3C-104%3Emain%3A%3AInputPixelType%3C-30%3E%3C-128%3E%3C-103%3E+from+%3C-30%3E%3C-128%3E%3C-104%3Edouble%3C-30%3E%3C-128%3E%3C-103%3E%0A%0A%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0AitkVectorLevelSetFunctionTest2+%7C+Completed+%28OTHER_FAULT%29+%7C+%28$encoded_base_url%2Ftests%2F{$build1failedtestid}%29%0A%0A%0A%0A%2ATests+not+run%2A+%28first+1%29%0AitkVectorFiniteDifferenceFunctionTest1+%7C++%7C+%28$encoded_base_url%2Ftests%2F{$build1notruntestid}%29%0A%0A%0A%0A%2ADynamic+analysis+tests+failing+or+not+run%2A+%28first+1%29%0AitkGeodesicActiveContourLevelSetSegmentationModuleTest1+%28$encoded_base_url%2FviewDynamicAnalysisFile.php%3Fid%3D{$da_id}%29%0A%0A", + 'Standalone' => "https://github.com/Kitware/CDash/issues/new?title=FAILED+%28w%3D3%2C+t%3D6%2C+d%3D10%29%3A+IssueCreationProject+-+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug+-+Experimental&body=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid1}%0A%0AProject%3A+IssueCreationProject%0ASite%3A+camelot.kitware%0ABuild+Name%3A+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug%0ABuild+Time%3A+2009-02-23T07%3A10%3A38+UTC%0AType%3A+Experimental%0AWarnings%3A+3%0ATests+not+passing%3A+6%0ADynamic+analysis+tests+failing%3A+10%0A%0A%0A%2AWarnings%2A+%28first+1%29%0ATesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx+line+187+%28$encoded_base_url%2Fbuilds%2F{$buildid1}%2Fbuild%29%0A%5C...%5CSandbox%5CTesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx%3A187%3A+warning%3A+converting+to+%3C-30%3E%3C-128%3E%3C-104%3Emain%3A%3AInputPixelType%3C-30%3E%3C-128%3E%3C-103%3E+from+%3C-30%3E%3C-128%3E%3C-104%3Edouble%3C-30%3E%3C-128%3E%3C-103%3E%0A%0A%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0AitkVectorLevelSetFunctionTest2+%7C+Completed+%28OTHER_FAULT%29+%7C+%28$encoded_base_url%2Ftests%2F{$build1failedtestid}%29%0A%0A%0A%0A%2ATests+not+run%2A+%28first+1%29%0AitkVectorFiniteDifferenceFunctionTest1+%7C++%7C+%28$encoded_base_url%2Ftests%2F{$build1notruntestid}%29%0A%0A%0A%0A%2ADynamic+analysis+tests+failing+or+not+run%2A+%28first+1%29%0AitkGeodesicActiveContourLevelSetSegmentationModuleTest1+%28$encoded_base_url%2FviewDynamicAnalysisFile.php%3Fid%3D{$da_id}%29%0A%0A", 'SubProject' => "https://github.com/Kitware/CDash/issues/new?title=FAILED+%28t%3D1%29%3A+CDash%2FSubProject1+-+test_PR_comment+-+Experimental&body=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid2}%0A%0AProject%3A+CDash%0ASubProject%3A+SubProject1%0ASite%3A+elysium%0ABuild+Name%3A+test_PR_comment%0ABuild+Time%3A+2015-08-11T20%3A45%3A30+UTC%0AType%3A+Experimental%0ATests+not+passing%3A+1%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0Afoo+%7C+Completed+%28Failed%29+%7C+%28$encoded_base_url%2Ftests%2F{$build2failedtestid}%29%0A%0A", ], 'JIRA' => [ - 'Standalone' => "http://jira.atlassian.com/secure/CreateIssueDetails!init.jspa?pid=123&issuetype=1&summary=FAILED+%28w%3D3%2C+t%3D6%2C+d%3D10%29%3A+IssueCreationProject+-+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug+-+Experimental&description=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid1}%0A%0AProject%3A+IssueCreationProject%0ASite%3A+camelot.kitware%0ABuild+Name%3A+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug%0ABuild+Time%3A+2009-02-23T07%3A10%3A38+UTC%0AType%3A+Experimental%0AWarnings%3A+3%0ATests+not+passing%3A+6%0ADynamic+analysis+tests+failing%3A+10%0A%0A%0A%2AWarnings%2A+%28first+1%29%0ATesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx+line+187+%28$encoded_base_url%2Fbuilds%2F{$buildid1}%2Ferrors%29%0A%5C...%5CSandbox%5CTesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx%3A187%3A+warning%3A+converting+to+%3C-30%3E%3C-128%3E%3C-104%3Emain%3A%3AInputPixelType%3C-30%3E%3C-128%3E%3C-103%3E+from+%3C-30%3E%3C-128%3E%3C-104%3Edouble%3C-30%3E%3C-128%3E%3C-103%3E%0A%0A%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0AitkVectorLevelSetFunctionTest2+%7C+Completed+%28OTHER_FAULT%29+%7C+%28$encoded_base_url%2Ftests%2F{$build1failedtestid}%29%0A%0A%0A%0A%2ATests+not+run%2A+%28first+1%29%0AitkVectorFiniteDifferenceFunctionTest1+%7C++%7C+%28$encoded_base_url%2Ftests%2F{$build1notruntestid}%29%0A%0A%0A%0A%2ADynamic+analysis+tests+failing+or+not+run%2A+%28first+1%29%0AitkGeodesicActiveContourLevelSetSegmentationModuleTest1+%28$encoded_base_url%2FviewDynamicAnalysisFile.php%3Fid%3D{$da_id}%29%0A%0A", + 'Standalone' => "http://jira.atlassian.com/secure/CreateIssueDetails!init.jspa?pid=123&issuetype=1&summary=FAILED+%28w%3D3%2C+t%3D6%2C+d%3D10%29%3A+IssueCreationProject+-+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug+-+Experimental&description=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid1}%0A%0AProject%3A+IssueCreationProject%0ASite%3A+camelot.kitware%0ABuild+Name%3A+Linux-g%2B%2B-4.1-LesionSizingSandbox_Debug%0ABuild+Time%3A+2009-02-23T07%3A10%3A38+UTC%0AType%3A+Experimental%0AWarnings%3A+3%0ATests+not+passing%3A+6%0ADynamic+analysis+tests+failing%3A+10%0A%0A%0A%2AWarnings%2A+%28first+1%29%0ATesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx+line+187+%28$encoded_base_url%2Fbuilds%2F{$buildid1}%2Fbuild%29%0A%5C...%5CSandbox%5CTesting%5CitkDescoteauxSheetnessImageFilterTest2.cxx%3A187%3A+warning%3A+converting+to+%3C-30%3E%3C-128%3E%3C-104%3Emain%3A%3AInputPixelType%3C-30%3E%3C-128%3E%3C-103%3E+from+%3C-30%3E%3C-128%3E%3C-104%3Edouble%3C-30%3E%3C-128%3E%3C-103%3E%0A%0A%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0AitkVectorLevelSetFunctionTest2+%7C+Completed+%28OTHER_FAULT%29+%7C+%28$encoded_base_url%2Ftests%2F{$build1failedtestid}%29%0A%0A%0A%0A%2ATests+not+run%2A+%28first+1%29%0AitkVectorFiniteDifferenceFunctionTest1+%7C++%7C+%28$encoded_base_url%2Ftests%2F{$build1notruntestid}%29%0A%0A%0A%0A%2ADynamic+analysis+tests+failing+or+not+run%2A+%28first+1%29%0AitkGeodesicActiveContourLevelSetSegmentationModuleTest1+%28$encoded_base_url%2FviewDynamicAnalysisFile.php%3Fid%3D{$da_id}%29%0A%0A", 'SubProject' => "http://jira.atlassian.com/secure/CreateIssueDetails!init.jspa?pid=123&issuetype=1&summary=FAILED+%28t%3D1%29%3A+CDash%2FSubProject1+-+test_PR_comment+-+Experimental&description=Details+on+the+submission+can+be+found+at+$encoded_base_url%2Fbuilds%2F{$buildid2}%0A%0AProject%3A+CDash%0ASubProject%3A+SubProject1%0ASite%3A+elysium%0ABuild+Name%3A+test_PR_comment%0ABuild+Time%3A+2015-08-11T20%3A45%3A30+UTC%0AType%3A+Experimental%0ATests+not+passing%3A+1%0A%0A%0A%2ATests+failing%2A+%28first+1%29%0Afoo+%7C+Completed+%28Failed%29+%7C+%28$encoded_base_url%2Ftests%2F{$build2failedtestid}%29%0A%0A", ], ]; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 72a7f7db0e..91766910d5 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -26436,6 +26436,18 @@ parameters: count: 1 path: server.php + - + rawMessage: 'PHPDoc tag @var with type App\Models\Label is not subtype of type App\Models\Label&object{pivot: Illuminate\Database\Eloquent\Relations\Pivot}.' + identifier: varTag.type + count: 2 + path: tests/Browser/Pages/BuildBuildPageTest.php + + - + rawMessage: 'Parameter #2 $text of method Laravel\Dusk\Browser::assertSeeIn() expects string, mixed given.' + identifier: argument.type + count: 1 + path: tests/Browser/Pages/BuildBuildPageTest.php + - rawMessage: ''' Call to deprecated method coverageResults() of class App\Models\Build: @@ -26445,12 +26457,6 @@ parameters: count: 1 path: tests/Browser/Pages/BuildCoveragePageTest.php - - - rawMessage: 'PHPDoc tag @var with type App\Models\Label is not subtype of type App\Models\Label&object{pivot: Illuminate\Database\Eloquent\Relations\Pivot}.' - identifier: varTag.type - count: 2 - path: tests/Browser/Pages/BuildErrorsPageTest.php - - rawMessage: ''' Call to deprecated method coverageResults() of class App\Models\Build: diff --git a/resources/js/angular/views/partials/build.html b/resources/js/angular/views/partials/build.html index d9b16bc896..13d9a1f57e 100644 --- a/resources/js/angular/views/partials/build.html +++ b/resources/js/angular/views/partials/build.html @@ -293,14 +293,14 @@
- + {{::build.compilation.error}} - + +{{::build.compilation.nerrordiffp}} - + -{{::build.compilation.nerrordiffn}}
@@ -309,14 +309,14 @@
- + {{::build.compilation.warning}} +{{::build.compilation.nwarningdiffp}} - + -{{::build.compilation.nwarningdiffn}}
diff --git a/resources/js/vue/app.js b/resources/js/vue/app.js index 3304ff6ed3..8f4c5204ed 100755 --- a/resources/js/vue/app.js +++ b/resources/js/vue/app.js @@ -31,7 +31,7 @@ const app = Vue.createApp({ BuildFilesPage: Vue.defineAsyncComponent(() => import('./components/BuildFilesPage.vue')), BuildTargetsPage: Vue.defineAsyncComponent(() => import('./components/BuildTargetsPage.vue')), BuildCommandsPage: Vue.defineAsyncComponent(() => import('./components/BuildCommandsPage.vue')), - BuildErrorsPage: Vue.defineAsyncComponent(() => import('./components/BuildErrorsPage.vue')), + BuildBuildPage: Vue.defineAsyncComponent(() => import('./components/BuildBuildPage.vue')), CoverageFilePage: Vue.defineAsyncComponent(() => import('./components/CoverageFilePage.vue')), BuildCoveragePage: Vue.defineAsyncComponent(() => import('./components/BuildCoveragePage.vue')), CreateProjectPage: Vue.defineAsyncComponent(() => import('./components/CreateProjectPage.vue')), diff --git a/resources/js/vue/components/BuildErrorsPage.vue b/resources/js/vue/components/BuildBuildPage.vue similarity index 57% rename from resources/js/vue/components/BuildErrorsPage.vue rename to resources/js/vue/components/BuildBuildPage.vue index 63005c56dd..6df35a03fc 100644 --- a/resources/js/vue/components/BuildErrorsPage.vue +++ b/resources/js/vue/components/BuildBuildPage.vue @@ -1,18 +1,85 @@