forked from buildbot/buildbot
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into support-glob-recursive
- Loading branch information
Showing
12 changed files
with
127 additions
and
40 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
master/buildbot/newsfragments/buildbot-worker-ubuntu-18.04.feature
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| :issue:`4928`: Update buildbot worker image to ubuntu 18.04 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| :issue:`4873`: Fix Bitbucket Cloud hook crash due to changes in their API. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
www/base/src/app/changes/changebuilds/changebuilds.controller.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| class ChangeBuildsController { | ||
| constructor($scope, dataService, bbSettingsService, $stateParams, resultsService, $interval, restService) { | ||
|
|
||
| _.mixin($scope, resultsService); | ||
| $scope.settings = bbSettingsService.getSettingsGroup('ChangeBuilds'); | ||
| $scope.$watch('settings', () => bbSettingsService.save() | ||
| , true); | ||
| const buildsFetchLimit = $scope.settings.buildsFetchLimit.value; | ||
|
|
||
| const dataAccessor = dataService.open().closeOnDestroy($scope); | ||
| $scope.builders = dataAccessor.getBuilders(); | ||
|
|
||
| const changeId = $scope.changeId = $stateParams.changeid; | ||
|
|
||
| dataAccessor.getChanges(changeId).onNew = function(change) { | ||
| $scope.change = change; | ||
| } | ||
|
|
||
| const getBuildsData = function() { | ||
| let requestUrl = `changes/${changeId}/builds`; | ||
| if (!buildsFetchLimit == '') { | ||
| requestUrl = `changes/${changeId}/builds?limit=${buildsFetchLimit}`; | ||
| } | ||
| restService.get(requestUrl).then((data) => { | ||
| $scope.builds = data.builds; | ||
| }); | ||
| } | ||
|
|
||
| getBuildsData(); | ||
|
|
||
| const stop = $interval(() => { | ||
| getBuildsData(); | ||
| }, 5000); | ||
|
|
||
| $scope.$on('$destroy', () => $interval.cancel(stop)); | ||
| } | ||
| } | ||
|
|
||
| angular.module('app') | ||
| .controller('changebuildsController', ['$scope', 'dataService', 'bbSettingsService', '$stateParams', 'resultsService', '$interval', 'restService', ChangeBuildsController]); |
35 changes: 35 additions & 0 deletions
35
www/base/src/app/changes/changebuilds/changebuilds.route.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| class ChangeBuildsState { | ||
| constructor($stateProvider, bbSettingsServiceProvider) { | ||
| // Name of the state | ||
| const name = 'changebuilds'; | ||
|
|
||
| // Configuration | ||
| const cfg = {} | ||
|
|
||
| // Register new state | ||
| const state = { | ||
| controller: `${name}Controller`, | ||
| template: require('./changebuilds.tpl.jade'), | ||
| name, | ||
| url: '/changes/:changeid', | ||
| data: cfg, | ||
| reloadOnSearch: false | ||
| } | ||
|
|
||
| $stateProvider.state(state); | ||
|
|
||
| bbSettingsServiceProvider.addSettingsGroup({ | ||
| name:'ChangeBuilds', | ||
| caption: 'ChangeBuilds page related settings', | ||
| items:[{ | ||
| type:'integer', | ||
| name:'buildsFetchLimit', | ||
| caption:'Maximum number of builds to fetch for the selected change', | ||
| default_value: '' | ||
| }] | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| angular.module('app') | ||
| .config(['$stateProvider', 'bbSettingsServiceProvider', ChangeBuildsState]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| .container | ||
| .row | ||
| changedetails(change="change") | ||
| div(ng-if="builds") | ||
| builds-table(builds="builds", builders="builders", ng-if="builds") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.