diff options
| author | Tom Duffield <tom@chef.io> | 2019-02-19 13:28:54 -0600 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2019-02-19 13:33:27 -0600 |
| commit | 51b8d56902df9a48821a0c9e47b92fddcc2b3756 (patch) | |
| tree | a79780688583a26ee443b954d4826eb512670fae | |
| parent | 38bbb873311c0264cd701c6cf93bfca42cdbe6c8 (diff) | |
| download | chef-51b8d56902df9a48821a0c9e47b92fddcc2b3756.tar.gz | |
Update the Expeditor config
* Use the scripts located on `master`
* Remove deprecated artifact_actions
* Add project alias
Signed-off-by: Tom Duffield <tom@chef.io>
| -rw-r--r-- | .expeditor/config.yml | 8 | ||||
| -rwxr-xr-x | .expeditor/update_dockerfile.sh | 8 | ||||
| -rwxr-xr-x | .expeditor/update_version.sh | 16 |
3 files changed, 7 insertions, 25 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 0e16585469..85eb79b41e 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -1,5 +1,9 @@ # Documentation available at https://expeditor.chef.io/docs/getting-started/ +# the name we use for this project when interacting with expeditor chatbot +project: + alias: chef-13 + # The name of the product keys for this product (from mixlib-install) product_key: - chef @@ -39,6 +43,8 @@ github: # for building. release_branch: - master: + version_constraint: 15* + - chef-14: version_constraint: 14* - chef-13: version_constraint: 13* @@ -49,7 +55,7 @@ merge_actions: ignore_labels: - "Expeditor: Skip Version Bump" - "Expeditor: Skip All" - - bash:.expeditor/update_version.sh: + - bash:.expeditor/update_version.sh@chef/chef@master: only_if: built_in:bump_version - built_in:update_changelog: ignore_labels: diff --git a/.expeditor/update_dockerfile.sh b/.expeditor/update_dockerfile.sh deleted file mode 100755 index 9ae260fcb8..0000000000 --- a/.expeditor/update_dockerfile.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# This file updates the default VERSION build argument in the Dockerfile to the -# VERSION passed in to the file via environment variables. - -set -evx - -sed -i -r "s/^ARG VERSION=.+/ARG VERSION=${VERSION}/" Dockerfile diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh deleted file mode 100755 index b2d76bc336..0000000000 --- a/.expeditor/update_version.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# After a PR merge, Chef Expeditor will bump the PATCH version in the VERSION file. -# It then executes this file to update any other files/components with that new version. -# - -set -evx - -sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-config/lib/chef-config/version.rb -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 - -# 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. |