diff options
| author | Tim Smith <tsmith@chef.io> | 2019-05-08 13:21:24 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2019-05-08 13:22:50 -0700 |
| commit | 56bcf57b6d7c6f8ae2831ef2793d4b40ab85a32a (patch) | |
| tree | 22209a06eea754ad71d9d77591e96f64bdc1ce72 | |
| parent | d82c20419b2288c730e0a0c3ff0ad36c2b5b4019 (diff) | |
| download | chef-56bcf57b6d7c6f8ae2831ef2793d4b40ab85a32a.tar.gz | |
Switch expeditor gem updating to use bundle lock
This should still get us an update without removing the lockfile first which resulted in the new file being written out as a Bundler 2.x file.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -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" |