Skip to content

Commit

Permalink
Merge pull request #57 from chef/jm/expeditor_config
Browse files Browse the repository at this point in the history
Update expeditor config to properly handle url updates in readme.
  • Loading branch information
jonsmorrow authored Apr 6, 2018
2 parents 6cf744c + 100aa4a commit c1b9ba5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ merge_actions:
- "Meta: Exclude From Changelog"
- "Expeditor: Exclude From Changelog"
- "Expeditor: Skip All"
- bash:.expeditor/update_readme_download_urls.sh:
only_if: built_in:bump_version
- built_in:trigger_omnibus_release_build:
ignore_labels:
- "Omnibus: Skip Build"
Expand Down
4 changes: 1 addition & 3 deletions .expeditor/update_readme_download_urls.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#!/bin/bash
#
# After the release build expeditor will update the readme to include new
# package urls. Note if the build fails these links wont work. Also, they won't
# work during the build because we will have updated the readme before the
# artifacts are ready.
# package urls.

set -evx

Expand Down
6 changes: 0 additions & 6 deletions .expeditor/update_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,3 @@ sed -i -r "s/VERSION = \".*\"/VERSION = \"$(cat VERSION)\"/" components/chef-wo
# Ensure our Gemfile.lock reflects the new version
cd components/chef-workstation
bundle update chef-workstation
cd ../..

# run readme update script.
# TODO: Remove this when expeditor issue requiring mixlib install definition
# is fixed. This check prevents us changing our config file.
bash .expeditor/update_readme_download_urls.sh

0 comments on commit c1b9ba5

Please sign in to comment.