[arvados] updated: 2.7.0-5377-g0e131fba48

[git repository hosting]

Summary of changes:
 doc/_includes/_install_ruby_and_bundler.liquid |  10 +-
 lib/boot/cmd.go                                |   2 +-
 lib/boot/supervisor.go                         |   5 +-
 lib/install/deps.go                            | 225 +++++++++++++++----------
 4 files changed, 139 insertions(+), 103 deletions(-)

       via  0e131fba4895c95b4829c3c66da62f5bd1111832 (commit)
       via  c1bb2409cf5d6d062b5e549f43124ba4ce6e6008 (commit)
       via  1f7aeab7038ed8e2aa0f824185b392c8c13e6623 (commit)
       via  9fa5faed898bf23fcea8f4e7946e540473e42e08 (commit)
       via  dc6fb79ab1c3ba1aaa0e33261dea132ae40cb981 (commit)
       via  5f778e6945d8c3c216922f9aa1f45253a1c62376 (commit)
       via  6f6a06e13d12389ba045bc6694cb83b97f714e78 (commit)
       via  46fe1e60a1cd96a39163911edd821b3e316ca606 (commit)
       via  b77707a7b06d57145a7829458d476baf8573317e (commit)
       via  814cc4a5534ec1fc47dd4425d6577f1aa0aaa01a (commit)
       via  7a391142ec0c692e56f6aa63114d15ac995e4608 (commit)
       via  a369357c88259a337536d6586ee25bda83e3a8b4 (commit)
       via  4ad36ef0580a438f10c0f76a99c7502f5ed4473b (commit)
       via  bf31106bd4a74dd41cae846e1d51e02e033e9a90 (commit)
       via  d4a4a96d0690c3527acb71a624c58e696249f879 (commit)
       via  04f7b48fcae392b3f2d3ff1adfd822a18fb9b951 (commit)
       via  9031b369f5b31d6ea44573c9539b5bd6aa153cd5 (commit)
       via  486623f4ded7e95e085a590e2b5e6cb988b1ad7c (commit)
       via  5bc07be644dfaa923df770f0411735302cb68ddf (commit)
       via  9a9a55d66bbc28b460c8ffdf1973fd567e1ea6c3 (commit)
      from  7bc4217495b405c98ea4cad8178b8136383486cf (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 0e131fba4895c95b4829c3c66da62f5bd1111832
Merge: 7bc4217495 c1bb2409cf
Author: Tom Clegg <tom at curii.com>
Date:   Fri Nov 17 13:49:33 2023 -0500

    Merge branch '20846-ruby3'
    
    refs #20846
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit c1bb2409cf5d6d062b5e549f43124ba4ce6e6008
Author: Tom Clegg <tom at curii.com>
Date:   Thu Nov 16 18:51:48 2023 -0500

    20846: Specify nodejs version without 'v' prefix.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 814c0586e6..0f8d299aa4 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -40,7 +40,7 @@ const (
 	pjsversion                = "1.9.8"
 	geckoversion              = "0.24.0"
 	gradleversion             = "5.3.1"
-	defaultNodejsVersion      = "v12.22.12"
+	defaultNodejsVersion      = "12.22.12"
 	devtestDatabasePassword   = "insecure_arvados_test"
 )
 
@@ -131,7 +131,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 		fmt.Fprintf(stderr, "invalid argument %q for -singularity-version\n", inst.SingularityVersion)
 		return 2
 	}
-	if ok, _ := regexp.MatchString(`^v\d`, inst.NodejsVersion); !ok {
+	if ok, _ := regexp.MatchString(`^\d`, inst.NodejsVersion); !ok {
 		fmt.Fprintf(stderr, "invalid argument %q for -nodejs-version\n", inst.NodejsVersion)
 		return 2
 	}
@@ -566,11 +566,11 @@ setcap "cap_sys_admin+pei cap_sys_chroot+pei" /var/lib/arvados/bin/nsenter
 	}
 
 	if !prod {
-		if havenodejsversion, err := exec.Command("/usr/local/bin/node", "--version").CombinedOutput(); err == nil && string(havenodejsversion) == inst.NodejsVersion+"\n" {
+		if havenodejsversion, err := exec.Command("/usr/local/bin/node", "--version").CombinedOutput(); err == nil && string(havenodejsversion) == "v"+inst.NodejsVersion+"\n" {
 			logger.Print("nodejs " + inst.NodejsVersion + " already installed")
 		} else {
 			err = inst.runBash(`
-NJS=`+inst.NodejsVersion+`
+NJS=v`+inst.NodejsVersion+`
 rm -rf /var/lib/arvados/node-*-linux-x64
 wget --progress=dot:giga -O- https://nodejs.org/dist/${NJS}/node-${NJS}-linux-x64.tar.xz | sudo tar -C /var/lib/arvados -xJf -
 ln -sfv /var/lib/arvados/node-${NJS}-linux-x64/bin/{node,npm} /usr/local/bin/
@@ -585,7 +585,7 @@ ln -sfv /var/lib/arvados/node-${NJS}-linux-x64/bin/{node,npm} /usr/local/bin/
 		} else {
 			err = inst.runBash(`
 npm install -g yarn
-ln -sfv /var/lib/arvados/node-`+inst.NodejsVersion+`-linux-x64/bin/{yarn,yarnpkg} /usr/local/bin/
+ln -sfv /var/lib/arvados/node-v`+inst.NodejsVersion+`-linux-x64/bin/{yarn,yarnpkg} /usr/local/bin/
 `, stdout, stderr)
 			if err != nil {
 				return 1

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


hooks/post-receive
--