Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump travis ruby and build www in a pr #6663

Merged
merged 1 commit into from Jun 14, 2019

Conversation

@mwrock
Copy link
Contributor

commented Jun 14, 2019

Signed-off-by: mwrock matt@mattwrock.com

@chef-expeditor

This comment has been minimized.

Copy link

commented Jun 14, 2019

Hello mwrock! Thanks for the pull request!

Here is what will happen next:

  1. Your PR will be reviewed by the maintainers.
  2. If everything looks good, one of them will approve it, and your PR will be merged.

Thank you for contributing!

@mwrock mwrock force-pushed the travis_ruby branch from 1c52cab to e70db84 Jun 14, 2019

@baumanj
Copy link
Member

left a comment

I think this should work fine as is, though I admit I found the logic surprisingly hard to parse (not because of your change, but because of the existing structure). If you're amenable, I think this may be clearer:

# TRAVIS_PULL_REQUEST is set to the pull request number if the current job is a pull request build, or false if it’s not.
#  https://docs.travis-ci.com/user/environment-variables/#convenience-variables
if [[ "${TRAVIS_PULL_REQUEST}" = "false" ]];then
  pr_triggered_build=false
else
  pr_triggered_build=true
fi

if $pr_triggered_build; then
  echo "We are on a PR. Going to just build the site."elif [[ "${TRAVIS_BRANCH}" = "master" ]]; then
  echo "We are not on a PR and on the master branch. Going to deploy the site."elif [[ "${TRAVIS_BRANCH}" =~ ^acceptance_deploy ]]; then
  echo "We are not on a PR and on an acceptance_deploy branch. Deploying to Acceptance."else
  echo "Not building web site."
fi
cd www
BUILDER_WEB_URL="https://bldr.acceptance.habitat.sh" GITHUB_APP_URL="https://github.com/apps/habitat-builder-acceptance" make acceptance
fi
echo "Not building web site."

This comment has been minimized.

Copy link
@baumanj

baumanj Jun 14, 2019

Member

What case does this represent? It's not a triggered by a PR and the branch is neither master nor acceptance_deploy, so I guess it's a manually-triggered run for some other branch?

This comment has been minimized.

Copy link
@mwrock

mwrock Jun 14, 2019

Author Contributor

yeah. I mainly put it is there because it would tell me I did something wrong above. It would only fire merging to another branch.

This comment has been minimized.

Copy link
@mwrock

mwrock Jun 14, 2019

Author Contributor

also good call on the above, I had to find the travis docs to explain why looking for true was not working with TRAVIS_PULL_REQUEST

bump travis ruby and build www in a pr
Signed-off-by: mwrock <matt@mattwrock.com>

@mwrock mwrock force-pushed the travis_ruby branch from e70db84 to cfb2a77 Jun 14, 2019

@mwrock mwrock merged commit a52e2f0 into master Jun 14, 2019

3 of 5 checks passed

buildkite/habitat-sh-habitat-master-verify Build #2401 started
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
DCO This commit has a DCO Signed-off-by
Details
buildkite/habitat-sh-habitat-master-website Build #2810 passed (37 seconds)
Details
expeditor/config-validation Validated your Expeditor config file
Details

@mwrock mwrock deleted the travis_ruby branch Jun 14, 2019

chef-ci added a commit that referenced this pull request Jun 14, 2019

Update CHANGELOG.md with details from pull request #6663
Obvious fix; these changes are the result of automation not creative thinking.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.