[ARVADOS-DEV] updated: a2286c2a22ddafa1d808e471ce74e7e5c1645047

Git user git at public.arvados.org
Thu Jan 28 16:53:06 UTC 2021


Summary of changes:
 jenkins/upload_packages_testing_to_stable.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  a2286c2a22ddafa1d808e471ce74e7e5c1645047 (commit)
      from  34d0c5b9868559bc8a76741ba64308d09ebffb9f (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 a2286c2a22ddafa1d808e471ce74e7e5c1645047
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jan 28 11:51:43 2021 -0500

    Fix version number regex to allow 4 number positions & values over 9
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/jenkins/upload_packages_testing_to_stable.sh b/jenkins/upload_packages_testing_to_stable.sh
index 87e12f9..74ee9cf 100755
--- a/jenkins/upload_packages_testing_to_stable.sh
+++ b/jenkins/upload_packages_testing_to_stable.sh
@@ -29,12 +29,13 @@ fi
 
 # Only numbered package versions are supposed to go into the stable repositories
 TMP=$(echo "$PACKAGES_TO_PUBLISH" | sed 's/versions://g;')
-VALIDATED_PACKAGES_TO_PUBLISH=`echo "$TMP" | sed -nE '/^.*: [0-9].[0-9].[0-9]-[0-9]$/p'`
+VERPATTERN='[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?-[0-9]+'
+VALIDATED_PACKAGES_TO_PUBLISH=`echo "$TMP" | sed -nE '/^.*: '"$VERPATTERN"'$/p'`
 
 if [[ "$TMP" != "$VALIDATED_PACKAGES_TO_PUBLISH" ]]; then
   echo "The list of packages has invalid syntax. each line must be of the format:"
   echo
-  echo "packagename: [0-9].[0-9].[0-9]-[0-9]"
+  echo "packagename: $VERPATTERN"
   echo
   exit 253
 fi

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list