projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21765-short-dialog'
[arvados.git]
/
lib
/
install
/
deps.go
diff --git
a/lib/install/deps.go
b/lib/install/deps.go
index 08312d738c15d86871b8626357e6cd6e308a140f..9c5eeaccfd22451c523b906f35f96d9378c11d65 100644
(file)
--- a/
lib/install/deps.go
+++ b/
lib/install/deps.go
@@
-31,11
+31,11
@@
import (
var Command cmd.Handler = &installCommand{}
var Command cmd.Handler = &installCommand{}
-const goversion = "1.2
0.6
"
+const goversion = "1.2
1.10
"
const (
defaultRubyVersion = "3.2.2"
const (
defaultRubyVersion = "3.2.2"
- defaultBundlerVersion = "
2.2.19
"
+ defaultBundlerVersion = "
~> 2.4.0
"
defaultSingularityVersion = "3.10.4"
pjsversion = "1.9.8"
geckoversion = "0.24.0"
defaultSingularityVersion = "3.10.4"
pjsversion = "1.9.8"
geckoversion = "0.24.0"
@@
-123,7
+123,7
@@
func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
fmt.Fprintf(stderr, "invalid argument %q for -ruby-version\n", inst.RubyVersion)
return 2
}
fmt.Fprintf(stderr, "invalid argument %q for -ruby-version\n", inst.RubyVersion)
return 2
}
- if ok, _ := regexp.MatchString(`^\d`, inst.BundlerVersion); !ok {
+ if ok, _ := regexp.MatchString(`^
*(|~>|[<>!=]=) *
\d`, inst.BundlerVersion); !ok {
fmt.Fprintf(stderr, "invalid argument %q for -bundler-version\n", inst.BundlerVersion)
return 2
}
fmt.Fprintf(stderr, "invalid argument %q for -bundler-version\n", inst.BundlerVersion)
return 2
}
@@
-351,7
+351,7
@@
make install
if [[ "$rubyversion" > "3" ]]; then
/var/lib/arvados/bin/gem update --no-document --system 3.4.21
fi
if [[ "$rubyversion" > "3" ]]; then
/var/lib/arvados/bin/gem update --no-document --system 3.4.21
fi
-/var/lib/arvados/bin/gem install
bundler --no-document
+/var/lib/arvados/bin/gem install
--conservative --no-document --version '`+inst.BundlerVersion+`' bundler
`, stdout, stderr)
if err != nil {
return 1
`, stdout, stderr)
if err != nil {
return 1
@@
-901,7
+901,6
@@
func prodpkgs(osv osversion) []string {
"curl",
"fuse",
"git",
"curl",
"fuse",
"git",
- "gitolite3",
"graphviz",
"haveged",
"libcurl3-gnutls",
"graphviz",
"haveged",
"libcurl3-gnutls",