Merge branch 'qa' into fix/export

uclibs · May 13, 2024 · 5034731 · 5034731
2 parents 368e9e7 + b77499a
commit 5034731
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.env.test b/.env.test
@@ -3,7 +3,7 @@ APP_PORTFOLIO_DEVISE_KEY = "04df95945691e59c493829316335a454f1b50706a68a2c9ae1fe
 # Database settings
 APP_PORTFOLIO_DATABASE_ADAPTER=sqlite3
 APP_PORTFOLIO_DATABASE_HOST=
-APP_PORTFOLIO_DATABASE_NAME=db/development.sqlite3
+APP_PORTFOLIO_DATABASE_NAME=db/test.sqlite3
 APP_PORTFOLIO_DATABASE_PASSWORD=
 APP_PORTFOLIO_DATABASE_POOL=5
 APP_PORTFOLIO_DATABASE_PORT=

diff --git a/scripts/check_ruby.sh b/scripts/check_ruby.sh
@@ -6,5 +6,6 @@ RUBY_VERSION=$(cat .ruby-version | sed s/ruby-//)
 if rbenv versions | grep -q $RUBY_VERSION; then
     echo 'Ruby' $RUBY_VERSION 'is installed'
 else
+    git -C /home/apache/.rbenv/plugins/ruby-build pull
     RUBY_CONFIGURE_OPTS="--disable-dtrace" rbenv install $RUBY_VERSION
-fi
+fi