diff options
| author | Tim Smith <tsmith@chef.io> | 2019-03-19 10:00:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 10:00:54 -0700 |
| commit | 64846b3e27589c13a8bd617be1ea4373ca738158 (patch) | |
| tree | ee5ec3e1103006c7e938989b35d68f085c507b86 | |
| parent | 2dc4b039497ec0b065932b079bda0f8f40534360 (diff) | |
| parent | 43ce817abbc69cfed03c72e24f68fcf1945441df (diff) | |
| download | chef-64846b3e27589c13a8bd617be1ea4373ca738158.tar.gz | |
Merge pull request #8309 from chef/exp
Attempt a convervative bundle update when bumping chef versions
| -rw-r--r-- | .expeditor/update_dep.sh | 3 | ||||
| -rwxr-xr-x | .expeditor/update_version.sh | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh index e71c91276b..1041f7504a 100644 --- a/.expeditor/update_dep.sh +++ b/.expeditor/update_dep.sh @@ -11,9 +11,6 @@ set -evx -# this attempts to work around the bundle update making unsolvable dep tree -asdf local ruby 2.5.3 - function new_gem_included() { git diff | grep -E '^\+' | grep "${EXPEDITOR_GEM_NAME} (${EXPEDITOR_VERSION})" } diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh index 222ae5cf27..18c4a75747 100755 --- a/.expeditor/update_version.sh +++ b/.expeditor/update_version.sh @@ -15,7 +15,7 @@ sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-config sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"$(cat VERSION)\")/" lib/chef/version.rb # Update the version inside Gemfile.lock -bundle update chef chef-config --jobs=7 +bundle update chef chef-config --jobs=7 --conservative # Once Expeditor finshes executing this script, it will commit the changes and push # the commit as a new tag corresponding to the value in the VERSION file. |