remove bundle check and just bundle install
the bundle check was falsely reporting as dependencies met with updates to Gemfile.rails70.local.partial. Remove the bundle check and just run bundle install, if there are not updates it's still fast and doesn't cost any time Test Plan: -with a clean state -downgrade a gem in Gemfile.rails70.lock.partial e.g. strscan (3.0.6) -> 3.0.5 -run docker_dev_setup.sh -confirm gem version in Gemfile.rails70.lock -restore the gem in Gemfile.rails70.lock.partial -run docker_dev_update -the gem is updated in Gemfile.rails70.lock to match Gemfile.rails70.lock.partial Change-Id: Ide32d45667502df7882b374de4773b63f687d153 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/315997 Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com> Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com> QA-Review: James Butters <jbutters@instructure.com> Product-Review: James Butters <jbutters@instructure.com>
This commit is contained in:
parent
d8e365bfc7
commit
5a89713b86
|
@ -32,7 +32,7 @@ function update_canvas {
|
|||
fi
|
||||
|
||||
if [[ -z "$SKIP_DEPS" ]] ; then
|
||||
bundle_install_with_check
|
||||
bundle_install
|
||||
install_node_packages
|
||||
fi
|
||||
|
||||
|
|
|
@ -98,22 +98,10 @@ If you want to migrate the existing database, cancel now
|
|||
|
||||
function bundle_install {
|
||||
start_spinner " Installing gems (bundle install) ..."
|
||||
run_command bash -c 'rm -f Gemfile.lock* >/dev/null 2>&1'
|
||||
_canvas_lms_track_with_log run_command bundle install
|
||||
stop_spinner
|
||||
}
|
||||
|
||||
function bundle_install_with_check {
|
||||
start_spinner "Checking your gems (bundle check)..."
|
||||
if _canvas_lms_track_with_log run_command bundle check ; then
|
||||
stop_spinner
|
||||
echo_console_and_log " Gems are up to date, no need to bundle install ..."
|
||||
else
|
||||
stop_spinner
|
||||
bundle_install
|
||||
fi
|
||||
}
|
||||
|
||||
function rake_db_migrate_dev_and_test {
|
||||
start_spinner "Migrating development DB..."
|
||||
_canvas_lms_track_with_log run_command bundle exec rake db:migrate RAILS_ENV=development
|
||||
|
|
|
@ -103,7 +103,7 @@ init_log_file "Docker Dev Update"
|
|||
[[ -n "$UPDATE_CODE" ]] && ./script/rebase_canvas_and_plugins.sh "${params[@]}"
|
||||
if [[ -n "$REBUILD_DOCKER" ]]; then rebuild_docker_images; else check_dockerfile; fi
|
||||
docker_compose_up
|
||||
bundle_install_with_check
|
||||
bundle_install
|
||||
install_node_packages
|
||||
compile_assets
|
||||
rake_db_migrate_dev_and_test
|
||||
|
|
Loading…
Reference in New Issue