[ARVADOS] updated: 2.1.0-1140-gf5a518f3b

Git user git at public.arvados.org
Fri Jul 30 17:31:46 UTC 2021


Summary of changes:
 build/run-build-packages-one-target.sh | 3 +++
 1 file changed, 3 insertions(+)

       via  f5a518f3b72f8003793d617708974e30b2186b2c (commit)
      from  23ce820aad666f5ad897ffe106f8b5f7e4baac33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f5a518f3b72f8003793d617708974e30b2186b2c
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Jul 30 13:27:35 2021 -0400

    Add extra validation of our package version format in the build scripts,
    it must match
    
      ^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+|)(~rc[0-9]+|~dev[0-9]+|)-[0-9]+$
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 056a1fbb1..81aac9c61 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -106,6 +106,9 @@ while [ $# -gt 0 ]; do
             elif ! [[ "$2" =~ (.*)-(.*) ]]; then
                 echo >&2 "FATAL: --build-version '$2' does not include an iteration. Try '${2}-1'?"
                 exit 1
+            elif ! [[ "$2" =~ ^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+|)(~rc[0-9]+|~dev[0-9]+|)-[0-9]+$ ]]; then
+                echo >&2 "FATAL: --build-version '$2' is invalid, must match pattern ^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+|)(~rc[0-9]+|~dev[0-9]+|)-[0-9]+$"
+                exit 1
             else
                 ARVADOS_BUILDING_VERSION="${BASH_REMATCH[1]}"
                 ARVADOS_BUILDING_ITERATION="${BASH_REMATCH[2]}"

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list