Skip to content

Commit

Permalink
Merge pull request #1256 from rspec/update-travis-build-scripts-2014-…
Browse files Browse the repository at this point in the history
…12-26-for-master

Updates from rspec-dev (2014-12-26)

[ci skip]
  • Loading branch information
cupakromer committed Dec 27, 2014
2 parents 71e0522 + 523194a commit ba3d5b6
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
# This file was generated on 2014-11-15T14:32:55+11:00 from the rspec-dev repo.
# This file was generated on 2014-12-26T22:23:09-08:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# This file contains defaults for RSpec projects. Individual projects
Expand Down
5 changes: 3 additions & 2 deletions appveyor.yml
@@ -1,4 +1,4 @@
# This file was generated on 2014-11-15T14:32:55+11:00 from the rspec-dev repo.
# This file was generated on 2014-12-26T22:23:09-08:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

version: "{build}"
Expand All @@ -18,7 +18,8 @@ install:
- SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
- ruby --version
- gem --version
- gem install bundler
# We lock to 1.7.7 to avoid warnings from 1.7.8
- gem install bundler -v=1.7.7
- bundler --version
- bundle install
- cinst ansicon
Expand Down
2 changes: 1 addition & 1 deletion script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2014-11-15T14:32:55+11:00 from the rspec-dev repo.
# This file was generated on 2014-12-26T22:23:09-08:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/functions.sh
@@ -1,4 +1,4 @@
# This file was generated on 2014-11-15T14:32:55+11:00 from the rspec-dev repo.
# This file was generated on 2014-12-26T22:23:09-08:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down
2 changes: 1 addition & 1 deletion script/predicate_functions.sh
@@ -1,4 +1,4 @@
# This file was generated on 2014-11-15T14:32:55+11:00 from the rspec-dev repo.
# This file was generated on 2014-12-26T22:23:09-08:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

function is_mri {
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2014-11-15T14:32:55+11:00 from the rspec-dev repo.
# This file was generated on 2014-12-26T22:23:09-08:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/travis_functions.sh
@@ -1,4 +1,4 @@
# This file was generated on 2014-11-15T14:32:55+11:00 from the rspec-dev repo.
# This file was generated on 2014-12-26T22:23:09-08:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# Taken from:
Expand Down

0 comments on commit ba3d5b6

Please sign in to comment.