Skip to content

Commit

Permalink
Tightened SPEC_VERSION regex -- Thank you, Bill Shannon!
Browse files Browse the repository at this point in the history
Replaced phrasing 'scrubbed' with 'validated'
Signed-off-by: David Blevins <david.blevins@gmail.com>
  • Loading branch information
dblevins committed Aug 20, 2019
1 parent 364bb21 commit ee8bf41
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions promotion/README.adoc
Expand Up @@ -10,21 +10,21 @@ To sign and publish officially approved binaries a member of the Specification C

The short name of the specification as used in URLs, such as "dependency-injection", "enterprise-beans", "messaging".

Input is scrubbed to strictly match the following regex `[a-z][a-z-]*[a-z]`
Input is validated to strictly match the following regex `[a-z][a-z-]*[a-z]`

### SPEC_VERSION

The two-digit version number of the specification as used in URLs, such as "1.0", "3.2", "2.0"

Input is scrubbed to strictly match the following regex `[1-9][0-9.]*`
Input is validated to strictly match the following regex `[1-9][0-9]*(.[0-9]+)?`

### FILE_URLS

Newline-separated list of TCK or other files that should be published. Acceptable extensions include pdf, txt, zip, tar.gz, jar, war, ear. URLs must start with `https://download.eclipse.org`

At least one URL must be supplied. This will typically be the TCK, but could also be other files such as specification PDFs or exclude lists.

Input is scrubbed to strictly match the following regex `https?://download.eclipse.org/[a-zA-Z0-9_./-]+\.(zip|tar.gz|pdf|jar|war|ear|txt)`
Input is validated to strictly match the following regex `https?://download.eclipse.org/[a-zA-Z0-9_./-]+\.(zip|tar.gz|pdf|jar|war|ear|txt)`

NOTE: We may decide to expand the locations from where we will accept URLs, such as github.com or Maven Central. It was left conservative to match existing behavior.

Expand Down Expand Up @@ -62,7 +62,7 @@ The https://ci.eclipse.org/jakartaee-spec-committee/job/remove-file/[remove-file

|===
| SPEC_NAME | `[a-z][a-z-]*[a-z]`
| SPEC_VERSION | `[1-9][0-9.]*`
| SPEC_VERSION | `[1-9][0-9]*(.[0-9]+)?`
| SPEC_FILE | `[a-zA-Z][a-zA-Z0-9._-]+[a-zA-Z0-9]`
|===

Expand All @@ -72,7 +72,7 @@ The https://ci.eclipse.org/jakartaee-spec-committee/job/remove-release/[remove-r

|===
| SPEC_NAME | `[a-z][a-z-]*[a-z]`
| SPEC_VERSION | `[1-9][0-9.]*`
| SPEC_VERSION | `[1-9][0-9]*(.[0-9]+)?`
| SPEC_FILE | `[a-zA-Z][a-zA-Z0-9._-]+[a-zA-Z0-9]`
|===

Expand Down
2 changes: 1 addition & 1 deletion promotion/promote-release.sh
Expand Up @@ -11,7 +11,7 @@ source "$(dirname $0)/keys.sh"
require KEYRING
require PASSPHRASE
require SPEC_NAME "[a-z][a-z-]*[a-z]"
require SPEC_VERSION "[1-9][0-9.]*"
require SPEC_VERSION "[1-9][0-9]*(.[0-9]+)?"
require FILE_URLS "https?://download.eclipse.org/[a-zA-Z0-9_./-]+\.(zip|tar.gz|pdf|jar|war|ear|txt)"

##[ Main ]#######################
Expand Down
2 changes: 1 addition & 1 deletion promotion/remove-file.sh
Expand Up @@ -7,7 +7,7 @@ source "$(dirname $0)/utils.sh"
##[ Required Environment ]#######

require SPEC_NAME "[a-z][a-z-]*[a-z]"
require SPEC_VERSION "[1-9][0-9.]*"
require SPEC_VERSION "[1-9][0-9]*(.[0-9]+)?"
require SPEC_FILE "[a-zA-Z][a-zA-Z0-9._-]+[a-zA-Z0-9]"

##[ Main ]#######################
Expand Down
2 changes: 1 addition & 1 deletion promotion/remove-release.sh
Expand Up @@ -7,7 +7,7 @@ source "$(dirname $0)/utils.sh"
##[ Required Environment ]#######

require SPEC_NAME "[a-z][a-z-]*[a-z]"
require SPEC_VERSION "[1-9][0-9.]*"
require SPEC_VERSION "[1-9][0-9]*(.[0-9]+)?"

##[ Main ]#######################

Expand Down

0 comments on commit ee8bf41

Please sign in to comment.