screwdriver-data-schema 23.2.2 → 23.3.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/base.js CHANGED
@@ -80,7 +80,7 @@ const SCHEMA_CONFIG_PRE_TEMPLATE_MERGE = Joi.object()
80
80
  }),
81
81
  cache: SCHEMA_CACHE,
82
82
  childPipelines: SCHEMA_CHILD_PIPELINES,
83
- stages: SCHEMA_STAGES.when('template', { is: Joi.exist(), then: Joi.forbidden() }),
83
+ stages: SCHEMA_STAGES,
84
84
  subscribe: SCHEMA_SUBSCRIBE,
85
85
  parameters: Parameters.parameters.default({})
86
86
  })
package/config/regex.js CHANGED
@@ -51,8 +51,8 @@ module.exports = {
51
51
  INTERNAL_TRIGGER: /^~([\w-]+)$/,
52
52
  // Stages can only be named with A-Z,a-z,0-9,-,_
53
53
  STAGE_NAME: /^[\w-]+$/,
54
- // Stage trigger like ~stage@deploy or ~stage@stageName:jobName
55
- STAGE_TRIGGER: /^~stage@([\w-]+)(?::([\w-]+))?$/,
54
+ // Stage trigger like ~stage@deploy or ~stage@stageName:jobName or stage@deploy or stage@stageName:jobName
55
+ STAGE_TRIGGER: /^~?stage@([\w-]+)(?::([\w-]+))?$/,
56
56
  // Don't combine EXTERNAL_TRIGGER and EXTERNAL_TRIGGER_AND for backward compatibility
57
57
  // BlockBy does not support EXTERNAL_TRIGGER_AND
58
58
  // External trigger like ~sd@123:component (OR case)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "screwdriver-data-schema",
3
- "version": "23.2.2",
3
+ "version": "23.3.0",
4
4
  "description": "Internal Data Schema of Screwdriver",
5
5
  "main": "index.js",
6
6
  "scripts": {