[arvados] updated: 2.7.0-6455-g8b91442e26

git repository hosting git at public.arvados.org
Mon Apr 22 20:07:40 UTC 2024


Summary of changes:
 build/run-library.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

       via  8b91442e262317e7760554b4bf0b6d7ef8fd30d3 (commit)
      from  f249cb9de50e7da3806aca5f07ed7e733b9dbc7e (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 8b91442e262317e7760554b4bf0b6d7ef8fd30d3
Author: Brett Smith <brett.smith at curii.com>
Date:   Mon Apr 22 16:07:18 2024 -0400

    21700: Adjust `gem fetch` syntax to work on Ruby 2.7
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 2082dc94a0..53e3d0a52c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -532,15 +532,18 @@ handle_rails_package() {
         # gems that are already available system-wide... and then it complains
         # that your bundle is incomplete. Work around this by fetching gems
         # manually.
+        # TODO: Once all our supported distros have Ruby 3+, we can modify
+        # the awk script to print "NAME:VERSION" output, and pipe that directly
+        # to `xargs -0r gem fetch` for reduced overhead.
         mkdir -p vendor/cache
         awk -- '
-BEGIN { OFS=":"; ORS="\0"; }
+BEGIN { OFS="\0"; ORS="\0"; }
 (/^[[:space:]]*$/) { level=0; }
 ($0 == "GEM" || $0 == "  specs:") { level+=1; }
 (level == 2 && NF == 2 && $1 ~ /^[[:alpha:]][-_[:alnum:]]*$/ && $2 ~ /^\([[:digit:]]+[-_+.[:alnum:]]*\)$/) {
-    print $1, substr($2, 2, length($2) - 2);
+    print "--version", substr($2, 2, length($2) - 2), $1;
 }
-' Gemfile.lock | env -C vendor/cache xargs -0r gem fetch
+' Gemfile.lock | env -C vendor/cache xargs -0r --max-args=3 gem fetch
         # Despite the bug, we still run `bundle cache` to make sure Bundler is
         # happy for later steps.
         bundle cache

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list