Launcher fails after latest commits


(Tzanko Matev) #1

When running ./launcher bootstrap app I get the following error message:

I, [2017-12-19T12:38:25.878582 #15]  INFO -- : > cd /var/www/discourse && git fetch origin tests-passed
From https://github.com/discourse/discourse
 * branch            tests-passed -> FETCH_HEAD
I, [2017-12-19T12:38:28.270063 #15]  INFO -- : 
I, [2017-12-19T12:38:28.270201 #15]  INFO -- : > cd /var/www/discourse && git checkout tests-passed
error: Your local changes to the following files would be overwritten by checkout:
        app/assets/javascripts/locales/sr.js.erb
Please, commit your changes or stash them before you can switch branches.
Aborting
I, [2017-12-19T12:38:28.406612 #15]  INFO -- : 


FAILED
--------------------
Pups::ExecError: cd /var/www/discourse && git checkout tests-passed failed with return #<Process::Status: pid 69 exit 1>
Location of failure: /pups/lib/pups/exec_command.rb:108:in `spawn'
exec failed with the params {"cd"=>"$home", "hook"=>"code", "cmd"=>["git reset --hard", "git clean -f", "git remote set-branches --add origin master", "git pull", "git fetch origin $version", "git checkout $version", "mkdir -p tmp/pids", "mkdir -p tmp/sockets", "touch tmp/.gitkeep", "mkdir -p                    /shared/log/rails", "bash -c \"touch -a           /shared/log/rails/{production,production_errors,unicorn.stdout,unicorn.stderr}.log\"", "bash -c \"ln    -s           /shared/log/rails/{production,production_errors,unicorn.stdout,unicorn.stderr}.log $home/log\"", "bash -c \"mkdir -p           /shared/{uploads,backups}\"", "bash -c \"ln    -s           /shared/{uploads,backups} $home/public\"", "chown -R discourse:www-data /shared/log/rails /shared/uploads /shared/backups"]}
715e5e87c5c947c310a17451f0c16479a4f12a05232ab068b892ef7bb5717198
** FAILED TO BOOTSTRAP ** please scroll up and look for earlier error messages, there may be more than one

I suspect that the error was introduced by this commit: FEATURE: Serbian translation (#5443) · discourse/discourse@0df1c85 · GitHub


(Gerhard Schlager) #2

I’m looking into it.

Fixed: CRLF caused problems with launch script · discourse/discourse@84c975e · GitHub


(Tzanko Matev) #3

It works now. @gerhard, thank you for the quick reaction!


(Gerhard Schlager) #4