Skip to content

Commit

Permalink
Merge pull request #2489 from Maroo-b/2435_rename_travis_to_ci
Browse files Browse the repository at this point in the history
Rename filenames from travis to ci
  • Loading branch information
pirj authored and JonRowe committed Apr 21, 2021
1 parent 7c9b320 commit bc9687f
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Rakefile
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
12 changes: 6 additions & 6 deletions example_app_generator/generate_app.rb
Expand Up @@ -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")
Expand Down Expand Up @@ -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
5 changes: 0 additions & 5 deletions script/after_update_travis_build.sh

This file was deleted.

5 changes: 0 additions & 5 deletions script/before_update_travis_build.sh

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion script/functions.sh
Expand Up @@ -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.
Expand Down

0 comments on commit bc9687f

Please sign in to comment.