diff --git a/Rakefile b/Rakefile index a07a5f34a5..817340bfbb 100644 --- a/Rakefile +++ b/Rakefile @@ -58,7 +58,7 @@ namespace :generate do "--template=example_app_generator/generate_app.rb" in_example_app do - sh "./travis_retry_bundle_install.sh 2>&1" + sh "./ci_retry_bundle_install.sh 2>&1" # Rails 4+ cannot use a `rails` binstub generated by Bundler sh "bundle binstubs bundler rspec-core rake --force" sh "bundle binstubs railties" unless File.exist?("bin/rails") @@ -185,7 +185,7 @@ namespace :no_active_record do "--template=example_app_generator/generate_app.rb" in_example_app(app_dir: example_app_dir) do - sh "./travis_retry_bundle_install.sh 2>&1" + sh "./ci_retry_bundle_install.sh 2>&1" # Rails 4+ cannot use a `rails` binstub generated by Bundler sh "bundle binstubs bundler rspec-core rake --force" sh "bundle binstubs railties" unless File.exist?("bin/rails") diff --git a/example_app_generator/travis_retry_bundle_install.sh b/example_app_generator/ci_retry_bundle_install.sh similarity index 100% rename from example_app_generator/travis_retry_bundle_install.sh rename to example_app_generator/ci_retry_bundle_install.sh diff --git a/example_app_generator/generate_app.rb b/example_app_generator/generate_app.rb index fa8cc7e336..1cc56f5b68 100644 --- a/example_app_generator/generate_app.rb +++ b/example_app_generator/generate_app.rb @@ -5,10 +5,10 @@ rails_dependencies_gemfile = File.join(rspec_rails_repo_path, 'Gemfile-rails-dependencies') bundle_install_path = File.join(rspec_rails_repo_path, '..', 'bundle') maintenance_branch_file = File.join(rspec_rails_repo_path, 'maintenance-branch') -travis_retry_script = File.join( +ci_retry_script = File.join( rspec_rails_repo_path, 'example_app_generator', - 'travis_retry_bundle_install.sh' + 'ci_retry_bundle_install.sh' ) function_script_file = File.join(rspec_rails_repo_path, 'script/functions.sh') sqlite_initializer = File.join(rspec_rails_repo_path, "example_app_generator/config/initializers/sqlite3_fix.rb") @@ -69,12 +69,12 @@ copy_file maintenance_branch_file, 'maintenance-branch' - copy_file travis_retry_script, 'travis_retry_bundle_install.sh' - gsub_file 'travis_retry_bundle_install.sh', + copy_file ci_retry_script, 'ci_retry_bundle_install.sh' + gsub_file 'ci_retry_bundle_install.sh', 'FUNCTIONS_SCRIPT_FILE', function_script_file - gsub_file 'travis_retry_bundle_install.sh', + gsub_file 'ci_retry_bundle_install.sh', 'REPLACE_BUNDLE_PATH', bundle_install_path - chmod 'travis_retry_bundle_install.sh', 0755 + chmod 'ci_retry_bundle_install.sh', 0755 end diff --git a/script/after_update_travis_build.sh b/script/after_update_travis_build.sh deleted file mode 100755 index 61b7bc5486..0000000000 --- a/script/after_update_travis_build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e - -echo "Restoring custom Travis config" -mv .travis.yml{.update_backup,} diff --git a/script/before_update_travis_build.sh b/script/before_update_travis_build.sh deleted file mode 100755 index 2f69e9698a..0000000000 --- a/script/before_update_travis_build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e - -echo "Backing up custom Travis config" -mv .travis.yml{,.update_backup} diff --git a/script/travis_functions.sh b/script/ci_functions.sh similarity index 100% rename from script/travis_functions.sh rename to script/ci_functions.sh diff --git a/script/functions.sh b/script/functions.sh index 66288ed245..145fe378f1 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -2,7 +2,7 @@ # 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 )" -source $SCRIPT_DIR/travis_functions.sh +source $SCRIPT_DIR/ci_functions.sh source $SCRIPT_DIR/predicate_functions.sh # If JRUBY_OPTS isn't set, use these.