diff options
| author | Tim Smith <tsmith@chef.io> | 2019-06-03 14:09:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 14:09:11 -0700 |
| commit | b7ee1363050c50ab44d9c5edd015f262bdec3148 (patch) | |
| tree | 7651bd46e6ea60e6f3588b7f01f192dc9b5871a9 | |
| parent | d71f5d5b4933bd8537f289dfdceeb1c60b360d2a (diff) | |
| parent | f8cc7d6112e0df2ff04747b2370c1a775d9428ce (diff) | |
| download | ohai-b7ee1363050c50ab44d9c5edd015f262bdec3148.tar.gz | |
Merge pull request #1370 from chef/test_cleanup
Minor tweaks to our expeditor / build kite config
| -rw-r--r-- | .expeditor/config.yml | 17 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 8 |
2 files changed, 11 insertions, 14 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 5558ef15..dd916047 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -4,6 +4,7 @@ slack: notify_channel: chef-infra-notify +# Which Ruby Gems, built when the Omnibus package is built, to publish to rubygems.org # This publish is triggered by the `built_in:publish_rubygems` artifact_action. rubygems: - ohai @@ -11,8 +12,6 @@ rubygems: github: # This deletes the GitHub PR branch after successfully merged into the release branch delete_branch_on_merge: true - # The tag format to use (e.g. v1.0.0) - version_tag_format: "v{{version}}" # allow bumping the minor release via label minor_bump_labels: - "Expeditor: Bump Version Minor" @@ -27,16 +26,9 @@ github: version_constraint: 15.* - 14-stable: version_constraint: 14.* - - 13-stable: - version_constraint: 13.* changelog: - rollup_header: Changes not yet released to rubygems.orgs - -promote: - actions: - - built_in:rollover_changelog - - built_in:publish_rubygems + rollup_header: Changes not yet released to rubygems.org # These actions are taken, in order they are specified, anytime a Pull Request is merged. merge_actions: @@ -53,6 +45,11 @@ merge_actions: - built_in:build_gem: only_if: built_in:bump_version +promote: + actions: + - built_in:rollover_changelog + - built_in:publish_rubygems + pipelines: - verify: description: Pull Request validation tests diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 120884cd..44a48e2c 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -3,7 +3,7 @@ steps: - label: lint-chefstyle command: - bundle install --jobs=7 --retry=3 - - bundle exec chefstyle + - bundle exec rake style expeditor: executor: docker: @@ -20,16 +20,16 @@ steps: command: - asdf local ruby 2.5.5 - bundle install --jobs=7 --retry=3 - - bundle exec rake + - bundle exec rake spec expeditor: executor: docker: - label: run-specs-ruby-2.6 command: - - asdf local ruby 2.6.2 + - asdf local ruby 2.6.3 - bundle install --jobs=7 --retry=3 - - bundle exec rake + - bundle exec rake spec expeditor: executor: docker: |