Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1546181c5e9d
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 755dc4bfccab
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 30, 2016

  1. Don't trigger docker from this repo.

    The docker builds are triggered from the Ubuntu 12.04 and 14.04 builds in
    the rubinius-build repo.
    brixen committed Mar 30, 2016
    Copy the full SHA
    5e21618 View commit details
  2. Show what files were built on Heroku build.

    [ci skip]
    brixen committed Mar 30, 2016
    Copy the full SHA
    755dc4b View commit details
Showing with 5 additions and 1 deletion.
  1. +1 −1 .travis.yml
  2. +4 −0 scripts/deploy.sh
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ before_script:
- ./configure
script: rake ci
after_success:
- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then ./scripts/deploy.sh release github website triggers docker; fi
- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then ./scripts/deploy.sh release github website triggers; fi
branches:
only:
- master
4 changes: 4 additions & 0 deletions scripts/deploy.sh
Original file line number Diff line number Diff line change
@@ -161,7 +161,11 @@ function rbx_deploy_heroku_binary {
url="$(rbx_url_prefix "$bucket")"
name="$(rbx_heroku_release_name)"

ls "$name"*

for ext in "${file_exts[@]}"; do
ls "$name$ext"

if [[ -f $name$ext ]]; then
rbx_s3_upload "$url" "$bucket" "$name$ext" "$name$ext" "/ubuntu/cedar-14/" ||
fail "unable to upload file"