From 100aa4af3bbd599656874dcdb9bdf74d2c191a7b Mon Sep 17 00:00:00 2001 From: Jon Morrow Date: Wed, 4 Apr 2018 17:20:50 -0700 Subject: [PATCH] Update expeditor config to properly handle url updates in readme. Signed-off-by: Jon Morrow --- .expeditor/config.yml | 2 ++ .expeditor/update_readme_download_urls.sh | 4 +--- .expeditor/update_version.sh | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 6d5a32bc6..ad3beaf4b 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -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" diff --git a/.expeditor/update_readme_download_urls.sh b/.expeditor/update_readme_download_urls.sh index f4c5d369d..595eb0c91 100755 --- a/.expeditor/update_readme_download_urls.sh +++ b/.expeditor/update_readme_download_urls.sh @@ -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 diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh index bb649be33..50ac49d3d 100755 --- a/.expeditor/update_version.sh +++ b/.expeditor/update_version.sh @@ -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