Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Commit

Permalink
Add expeditor
Browse files Browse the repository at this point in the history
Expeditor is the next-generation utility that we'll use for version
bumping. It will include additional features that we don't currently
have like the ability to not bump a version on a specific PR.

Signed-off-by: Tom Duffield <tom@chef.io>
  • Loading branch information
tduffield committed Mar 31, 2017
1 parent fbf40a8 commit 987c5fb
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .expeditor/bundle_install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

set -evx

gem environment
bundler_version=$(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
gem install bundler -v $bundler_version --user-install --conservative
export BUNDLE_WITHOUT=omnibus_package:test:aix:bsd:linux:mac_os_x:solaris:windows:default
bundle _${bundler_version}_ install --no-deployment
14 changes: 14 additions & 0 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
product_key: chefdk

slack:
notify_channel: chef-notify

docker:
enable: true
build_args:
CHANNEL: "{{channel}}"
VERSION: "{{version}}"

github:
bump_version_on_merge: true
trigger_build_on_bump: true
11 changes: 11 additions & 0 deletions .expeditor/update_version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

set -evx

export LANG=en_US.UTF-8

. ci/bundle_install.sh

bundle exec rake expeditor_update_version

git checkout .bundle/config
23 changes: 23 additions & 0 deletions tasks/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,29 @@
end
end

task :expeditor_update_version do
begin
require "rake"

Rake::Task["version:update_gemfile_lock"].invoke

begin
Rake::Task["changelog:update"].invoke
rescue Exception => e
puts "There was an error updating the CHANGELOG"
puts e
end

begin
Rake::Task["update_dockerfile"].invoke
rescue Exception => e
puts "There was an error updating the Dockerfile"
puts e
end
end
end


namespace :version do
desc "Bump patch version in lib/chef-dk/version.rb and update Gemfile*.lock conservatively to include the new version. If Gemfile has changed, this will update modified constraints as well."
task :bump => "ci_version_bump"
Expand Down

0 comments on commit 987c5fb

Please sign in to comment.