Skip to content

Commit bc9687f

Browse files
pirjJonRowe
authored andcommitted
Merge pull request #2489 from Maroo-b/2435_rename_travis_to_ci
Rename filenames from travis to ci
1 parent 7c9b320 commit bc9687f

File tree

7 files changed

+9
-19
lines changed

7 files changed

+9
-19
lines changed

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ namespace :generate do
5858
"--template=example_app_generator/generate_app.rb"
5959

6060
in_example_app do
61-
sh "./travis_retry_bundle_install.sh 2>&1"
61+
sh "./ci_retry_bundle_install.sh 2>&1"
6262
# Rails 4+ cannot use a `rails` binstub generated by Bundler
6363
sh "bundle binstubs bundler rspec-core rake --force"
6464
sh "bundle binstubs railties" unless File.exist?("bin/rails")
@@ -185,7 +185,7 @@ namespace :no_active_record do
185185
"--template=example_app_generator/generate_app.rb"
186186

187187
in_example_app(app_dir: example_app_dir) do
188-
sh "./travis_retry_bundle_install.sh 2>&1"
188+
sh "./ci_retry_bundle_install.sh 2>&1"
189189
# Rails 4+ cannot use a `rails` binstub generated by Bundler
190190
sh "bundle binstubs bundler rspec-core rake --force"
191191
sh "bundle binstubs railties" unless File.exist?("bin/rails")

example_app_generator/generate_app.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
rails_dependencies_gemfile = File.join(rspec_rails_repo_path, 'Gemfile-rails-dependencies')
66
bundle_install_path = File.join(rspec_rails_repo_path, '..', 'bundle')
77
maintenance_branch_file = File.join(rspec_rails_repo_path, 'maintenance-branch')
8-
travis_retry_script = File.join(
8+
ci_retry_script = File.join(
99
rspec_rails_repo_path,
1010
'example_app_generator',
11-
'travis_retry_bundle_install.sh'
11+
'ci_retry_bundle_install.sh'
1212
)
1313
function_script_file = File.join(rspec_rails_repo_path, 'script/functions.sh')
1414
sqlite_initializer = File.join(rspec_rails_repo_path, "example_app_generator/config/initializers/sqlite3_fix.rb")
@@ -69,12 +69,12 @@
6969

7070
copy_file maintenance_branch_file, 'maintenance-branch'
7171

72-
copy_file travis_retry_script, 'travis_retry_bundle_install.sh'
73-
gsub_file 'travis_retry_bundle_install.sh',
72+
copy_file ci_retry_script, 'ci_retry_bundle_install.sh'
73+
gsub_file 'ci_retry_bundle_install.sh',
7474
'FUNCTIONS_SCRIPT_FILE',
7575
function_script_file
76-
gsub_file 'travis_retry_bundle_install.sh',
76+
gsub_file 'ci_retry_bundle_install.sh',
7777
'REPLACE_BUNDLE_PATH',
7878
bundle_install_path
79-
chmod 'travis_retry_bundle_install.sh', 0755
79+
chmod 'ci_retry_bundle_install.sh', 0755
8080
end

script/after_update_travis_build.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

script/before_update_travis_build.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.
File renamed without changes.

script/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5-
source $SCRIPT_DIR/travis_functions.sh
5+
source $SCRIPT_DIR/ci_functions.sh
66
source $SCRIPT_DIR/predicate_functions.sh
77

88
# If JRUBY_OPTS isn't set, use these.

0 commit comments

Comments
 (0)