diff options
author | Tim Smith <tsmith@chef.io> | 2019-05-08 13:30:24 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-08 13:30:24 -0700 |
commit | e793c825c857af87e745a8af479af71522ff20db (patch) | |
tree | f8d26179621d8a229abca6b8746ef47d10552472 | |
parent | 6fa3b5b44523dcea44f5233a8f26d3733496b258 (diff) | |
parent | 56bcf57b6d7c6f8ae2831ef2793d4b40ab85a32a (diff) | |
download | chef-e793c825c857af87e745a8af479af71522ff20db.tar.gz |
Merge pull request #8504 from chef/expeditor_update2
Switch expeditor gem updating to use bundle lock
-rw-r--r-- | .expeditor/config.yml | 6 | ||||
-rw-r--r-- | .expeditor/update_dep.sh | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 55a74e04f2..6dfd00400e 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -143,6 +143,6 @@ subscriptions: - workload: ruby_gem_published:cheffish-* actions: - bash:.expeditor/update_dep.sh -# - workload: ruby_gem_published:license-acceptance-* -# actions: -# - bash:.expeditor/update_dep.sh + - workload: ruby_gem_published:license-acceptance-* + actions: + - bash:.expeditor/update_dep.sh diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh index 1041f7504a..baf950c408 100644 --- a/.expeditor/update_dep.sh +++ b/.expeditor/update_dep.sh @@ -18,11 +18,9 @@ function new_gem_included() { branch="expeditor/${EXPEDITOR_GEM_NAME}_${EXPEDITOR_VERSION}" git checkout -b "$branch" -bundle install - tries=12 for (( i=1; i<=$tries; i+=1 )); do - bundle exec rake dependencies:update_gemfile_lock + bundle lock --update new_gem_included && break || sleep 20 if [ $i -eq $tries ]; then echo "Searching for '${EXPEDITOR_GEM_NAME} (${EXPEDITOR_VERSION})' ${i} times and did not find it" |