projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix package building, work around git issue caused by CVE-2022-24765.
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index e309d24011d4f01079ae7707c2e6b1f0bbd45832..67c54c98b0244a72842bccfbb964ce3dbd164c0c 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-3,8
+3,6
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-. `dirname "$(readlink -f "$0")"`/libcloud-pin.sh
-
COLUMNS=80
. `dirname "$(readlink -f "$0")"`/run-library.sh
COLUMNS=80
. `dirname "$(readlink -f "$0")"`/run-library.sh
@@
-517,10
+515,10
@@
setup_ruby_environment() {
|| fatal 'rvm gemset setup'
rvm env
|| fatal 'rvm gemset setup'
rvm env
- (bundle version | grep -q 2.
0.2) || gem install bundler -v 2.0.2
+ (bundle version | grep -q 2.
2.19) || gem install --no-document bundler -v 2.2.19
bundle="$(which bundle)"
echo "$bundle"
bundle="$(which bundle)"
echo "$bundle"
- "$bundle" version | grep 2.
0.2
|| fatal 'install bundler'
+ "$bundle" version | grep 2.
2.19
|| fatal 'install bundler'
else
# When our "bundle install"s need to install new gems to
# satisfy dependencies, we want them to go where "gem install
else
# When our "bundle install"s need to install new gems to
# satisfy dependencies, we want them to go where "gem install
@@
-546,19
+544,24
@@
setup_ruby_environment() {
echo "Will install dependencies to $(gem env gemdir)"
echo "Will install bundler and arvados gems to $tmpdir_gem_home"
echo "Gem search path is GEM_PATH=$GEM_PATH"
echo "Will install dependencies to $(gem env gemdir)"
echo "Will install bundler and arvados gems to $tmpdir_gem_home"
echo "Gem search path is GEM_PATH=$GEM_PATH"
- bundle="
$tmpdir_gem_home/bin/
bundle"
+ bundle="bundle"
(
export HOME=$GEMHOME
(
export HOME=$GEMHOME
- bundlers="$(gem list --details bundler)"
- versions=(1.16.6 1.17.3 2.0.2)
+ versions=(2.2.19)
for v in ${versions[@]}; do
for v in ${versions[@]}; do
- if !
echo "$bundlers" | fgrep -q "($v)"
; then
- gem install --user $(for v in ${versions[@]}; do echo bundler:${v}; done)
+ if !
gem list --installed --version "${v}" bundler >/dev/null
; then
+ gem install --
no-document --
user $(for v in ${versions[@]}; do echo bundler:${v}; done)
break
fi
done
"$bundle" version | tee /dev/stderr | grep -q 'version 2'
) || fatal 'install bundler'
break
fi
done
"$bundle" version | tee /dev/stderr | grep -q 'version 2'
) || fatal 'install bundler'
+ if test -d /var/lib/arvados-arvbox/ ; then
+ # Inside arvbox, use bundler-installed binstubs. The
+ # system bundler and rail's own bin/bundle refuse to work.
+ # I don't know why.
+ bundle=binstubs/bundle
+ fi
fi
}
fi
}
@@
-644,7
+647,7
@@
initialize() {
install_env() {
go mod download || fatal "Go deps failed"
install_env() {
go mod download || fatal "Go deps failed"
- which goimports >/dev/null || go
get golang.org/x/tools/cmd/goimports
|| fatal "Go setup failed"
+ which goimports >/dev/null || go
install golang.org/x/tools/cmd/goimports@latest
|| fatal "Go setup failed"
setup_virtualenv "$VENV3DIR"
. "$VENV3DIR/bin/activate"
setup_virtualenv "$VENV3DIR"
. "$VENV3DIR/bin/activate"
@@
-964,11
+967,11
@@
install_services/api() {
set -ex
cd "$WORKSPACE/services/api"
export RAILS_ENV=test
set -ex
cd "$WORKSPACE/services/api"
export RAILS_ENV=test
- if
"$bundle" exec
rails db:environment:set ; then
-
"$bundle" exec
rake db:drop
+ if
bin/
rails db:environment:set ; then
+
bin/
rake db:drop
fi
fi
-
"$bundle" exec
rake db:setup
-
"$bundle" exec
rake db:fixtures:load
+
bin/
rake db:setup
+
bin/
rake db:fixtures:load
) || return 1
}
) || return 1
}
@@
-1082,9
+1085,7
@@
install_deps() {
do_install services/api
do_install services/arv-git-httpd go
do_install services/keepproxy go
do_install services/api
do_install services/arv-git-httpd go
do_install services/keepproxy go
- do_install services/keepstore go
do_install services/keep-web go
do_install services/keep-web go
- do_install services/ws go
}
install_all() {
}
install_all() {