diff options
| author | Tom Duffield <tom@chef.io> | 2019-02-19 12:48:26 -0600 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2019-02-19 12:48:26 -0600 |
| commit | addd2f3558c1120eb20eed4a1e31f5ed11e61139 (patch) | |
| tree | 33d6bc6666d5ccc0e8ac9323c62396c03d10e7b1 | |
| parent | dd3094a5ec35d3130086b4f7d4e102b92e1ae9ed (diff) | |
| download | chef-tduffield/new-envvars.tar.gz | |
Update scripts to use new EXPEDITOR_ environment variablestduffield/new-envvars
Signed-off-by: Tom Duffield <tom@chef.io>
| -rw-r--r-- | .expeditor/update_dep.sh | 10 | ||||
| -rwxr-xr-x | .expeditor/update_dockerfile.sh | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh index 4784a0b236..b8c9a7561e 100644 --- a/.expeditor/update_dep.sh +++ b/.expeditor/update_dep.sh @@ -12,10 +12,10 @@ set -evx function new_gem_included() { - git diff | grep -E '^\+' | grep "${GEM_NAME} (${VERSION})" + git diff | grep -E '^\+' | grep "${EXPEDITOR_GEM_NAME} (${EXPEDITOR_VERSION})" } -branch="expeditor/${GEM_NAME}_${VERSION}" +branch="expeditor/${EXPEDITOR_GEM_NAME}_${EXPEDITOR_VERSION}" git checkout -b "$branch" bundle install @@ -25,10 +25,10 @@ for (( i=1; i<=$tries; i+=1 )); do bundle exec rake dependencies:update_gemfile_lock new_gem_included && break || sleep 20 if [ $i -eq $tries ]; then - echo "Searching for '${GEM_NAME} (${VERSION})' ${i} times and did not find it" + echo "Searching for '${EXPEDITOR_GEM_NAME} (${EXPEDITOR_VERSION})' ${i} times and did not find it" exit 1 else - echo "Searched ${i} times for '${GEM_NAME} (${VERSION})'" + echo "Searched ${i} times for '${EXPEDITOR_GEM_NAME} (${EXPEDITOR_VERSION})'" fi done @@ -36,7 +36,7 @@ git add . # give a friendly message for the commit and make sure it's noted for any future audit of our codebase that no # DCO sign-off is needed for this sort of PR since it contains no intellectual property -git commit --message "Bump $GEM_NAME to $VERSION" --message "This pull request was triggered automatically via Expeditor when $GEM_NAME $VERSION was promoted to Rubygems." --message "This change falls under the obvious fix policy so no Developer Certificate of Origin (DCO) sign-off is required." +git commit --message "Bump $EXPEDITOR_GEM_NAME to $EXPEDITOR_VERSION" --message "This pull request was triggered automatically via Expeditor when $EXPEDITOR_GEM_NAME $EXPEDITOR_VERSION was promoted to Rubygems." --message "This change falls under the obvious fix policy so no Developer Certificate of Origin (DCO) sign-off is required." open_pull_request diff --git a/.expeditor/update_dockerfile.sh b/.expeditor/update_dockerfile.sh index 3ed0ed186a..a9d266ff74 100755 --- a/.expeditor/update_dockerfile.sh +++ b/.expeditor/update_dockerfile.sh @@ -11,4 +11,4 @@ set -evx -sed -i -r "s/^ARG VERSION=.+/ARG VERSION=${VERSION}/" Dockerfile +sed -i -r "s/^ARG VERSION=.+/ARG VERSION=${EXPEDITOR_VERSION}/" Dockerfile |