screwdriver-data-schema 25.2.1 → 25.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/regex.js +2 -1
- package/core/scm.js +3 -1
- package/models/pipeline.js +1 -1
- package/package.json +1 -1
package/config/regex.js
CHANGED
|
@@ -71,13 +71,14 @@ module.exports = {
|
|
|
71
71
|
|
|
72
72
|
// Can be ~pr, ~commit, ~release, ~tag or ~commit:branchName, or ~sd@123:component
|
|
73
73
|
// Note: if you modify this regex, you must modify `sdJoi` definition in the `config/job.js`
|
|
74
|
-
TRIGGER: /^~?(sd@\d+:[\w-]+|(pr|commit|release|tag|subscribe)(:(.+))?)$/,
|
|
74
|
+
TRIGGER: /^~?(sd@\d+:[\w-]+|(pr|pr-closed|commit|release|tag|subscribe)(:(.+))?)$/,
|
|
75
75
|
// Triggers which always create event
|
|
76
76
|
CORE_TRIGGER: /^~(pr|commit)(:(.+))?$/,
|
|
77
77
|
// Triggers which does not create empty events
|
|
78
78
|
EXTRA_TRIGGER: /^~(release|tag)(:(.+))?$/,
|
|
79
79
|
// Can be ~pr or ~pr:branchName
|
|
80
80
|
PR_TRIGGER: /^~pr(:.+)?$/,
|
|
81
|
+
PR_CLOSED_TRIGGER: /^~pr-(closed)(:.+)?$/,
|
|
81
82
|
// Can be ~commit or ~commit:branchName
|
|
82
83
|
COMMIT_TRIGGER: /^~commit(:.+)?$/,
|
|
83
84
|
// Can be ~release or ~release:branchName
|
package/core/scm.js
CHANGED
|
@@ -185,7 +185,9 @@ const SCHEMA_HOOK = Joi.object()
|
|
|
185
185
|
|
|
186
186
|
modifiedFiles: Joi.array().items(Joi.string().allow('')).optional().label('Modified files of head commit'),
|
|
187
187
|
|
|
188
|
-
removedFiles: Joi.array().items(Joi.string().allow('')).optional().label('Removed files of head commit')
|
|
188
|
+
removedFiles: Joi.array().items(Joi.string().allow('')).optional().label('Removed files of head commit'),
|
|
189
|
+
|
|
190
|
+
prMerged: Joi.boolean().optional().label('Whether the pull request is merged').example(true).default(false)
|
|
189
191
|
})
|
|
190
192
|
.label('SCM Hook');
|
|
191
193
|
|
package/models/pipeline.js
CHANGED
|
@@ -10,7 +10,7 @@ const WorkflowGraph = require('../config/workflowGraph');
|
|
|
10
10
|
const Parameters = require('../config/parameters');
|
|
11
11
|
const mutate = require('../lib/mutate');
|
|
12
12
|
|
|
13
|
-
const STATES = ['ACTIVE', 'INACTIVE'];
|
|
13
|
+
const STATES = ['ACTIVE', 'INACTIVE', 'DELETING'];
|
|
14
14
|
const BADGE = Joi.object({
|
|
15
15
|
defaultName: Joi.string()
|
|
16
16
|
.max(128)
|