Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build script shouldn't generate -e tempfile #852

Closed
augustf opened this issue Jan 23, 2014 · 7 comments
Closed

Build script shouldn't generate -e tempfile #852

augustf opened this issue Jan 23, 2014 · 7 comments

Comments

@augustf
Copy link
Member

augustf commented Jan 23, 2014

I'm not sure why, but when I run release.sh, my git status only shows an untracked file lib/concerto/version.rb-e instead of an edited version.rb
@mfrederickson
Copy link
Contributor

Do you run it as ./tools/release.sh or just ./release.sh? And is this in a freshly cloned repo, or have you already run bundle install and rails s to review things? (I'm just trying to figure out how I should test it, too.)

@augustf
Copy link
Member Author

augustf commented Jan 23, 2014

I ran this from the directory as ./release.sh because it has some hard-coded ../ paths I believe. It wasn't a fresh repo though. I'll be trying it out on one shortly though.

@augustf
Copy link
Member Author

augustf commented Jan 23, 2014

Beliskner:/v/w/concerto(master_)$ cd tools/
Beliskner:/v/w/c/tools(master_)$ ./release.sh
Type the release number for this release: [1.2.3.MooseBuild]
0.8.6.JulietJaguar
Proceed with bundle update? [Y/n] n
Proceed with frontend rebuild? [Y/n] n
Proceed with version bump? [Y/n] y
[master 38010d9] Bump to 0.8.6.JulietJaguar.
1 file changed, 1 insertion(+), 1 deletion(-)
Proceed with tag creation? [Y/n] n

The release is finished. You should push using the following commands:

git push origin master
git push origin 0.8.6.julietjaguar

Thank you come again.
Beliskner:/v/w/c/tools(master*)$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)

Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)

modified:   ../Gemfile.lock

Untracked files:
(use "git add ..." to include in what will be committed)

../lib/concerto/version.rb-e

@augustf
Copy link
Member Author

augustf commented Jan 23, 2014

In this clean copy, it's more apparent what happened. The version.rb was correctly changed - but also committed. The -e file is just a leftover.

@mfrederickson
Copy link
Contributor

Here's what I get...

mfrederickson@sirius:~/projects/concerto/tools$ ./release.sh 
Type the release number for this release: [1.2.3.MooseBuild]
0.0.0.Test
Proceed with bundle update? [Y/n] 
/usr/local/rvm/rubies/ruby-2.0.0-p0/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:51:in `require': cannot load such file -- /home/mfrederickson/projects/concerto/tools/lib/command_check.rb (LoadError)
       /usr/local/rvm/rubies/ruby-2.0.0-p0/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:51:in `require'
       /home/mfrederickson/projects/concerto/Gemfile:43:in `eval_gemfile'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/dsl.rb:30:in `instance_eval'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/dsl.rb:30:in `eval_gemfile'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/dsl.rb:9:in `evaluate'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/definition.rb:19:in `build'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler.rb:148:in `definition'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/cli.rb:301:in `update'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/vendor/thor/task.rb:27:in `run'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/vendor/thor/invocation.rb:120:in `invoke_task'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/vendor/thor.rb:344:in `dispatch'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/vendor/thor/base.rb:434:in `start'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/bin/bundle:20:in `block in <top (required)>'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/lib/bundler/friendly_errors.rb:3:in `with_friendly_errors'
       /usr/local/rvm/gems/ruby-2.0.0-p0@global/gems/bundler-1.3.5/bin/bundle:20:in `<top (required)>'
       /usr/local/rvm/gems/ruby-2.0.0-p0/bin/bundle:19:in `load'
       /usr/local/rvm/gems/ruby-2.0.0-p0/bin/bundle:19:in `<main>'
       /usr/local/rvm/gems/ruby-2.0.0-p0/bin/ruby_noexec_wrapper:14:in `eval'
       /usr/local/rvm/gems/ruby-2.0.0-p0/bin/ruby_noexec_wrapper:14:in `<main>'
There was an error in your Gemfile, and Bundler cannot continue.
No gems updates found.
Proceed with frontend rebuild? [Y/n] ^C^C

@augustf
Copy link
Member Author

augustf commented Jan 23, 2014

Yikes-I didn't get that!

@mfrederickson
Copy link
Contributor

@augustf it already commited the version.rb bump file. Look in the script at L54. The other file, I think, is a sed backup file?

zr2d2 added a commit that referenced this issue Jan 25, 2014
@zr2d2
Merge branch 'refs/heads/master' into rails-4
f7a0cc4 
* refs/heads/master: (73 commits)
  reserved word changes closes #859
  add ordering to the individual queries
  Fixes #852 by not creating a backup file for sed -i
  Ok-more mucking with my path-trying again...
  Fixed local system libs for Gemfile
  Updated gems for 0.8.6
  Bump to 0.8.6.JulietJaguar.
  time parsing tweaks
  tweak time parsing
  Replace concerto-audio with concerto_audio...not sure why that was working...
  Add concerto_template_scheduling to seeds as disabled by default
  fix tz tweak to use times as local times
  Use Ruby 1.8.7 safe Time operations.
  set local zone to UTC for time tests
  use the user or system time zone on each request
  parse the start and ends times as if they are local
  Fixed an oversight of some i18n rubbish for #841
  add gems for scheduling for #835 and #576
  add gems for scheduling for #835 and #576
  add gems for scheduling for #835 and #576
  ...

Conflicts:
	Gemfile.lock
	app/models/template.rb
	db/seeds.rb
zr2d2 added a commit that referenced this issue Jan 25, 2014
@zr2d2
Merge branch 'refs/heads/master' into mulitple_kinds_per_field
cae94cd 
* refs/heads/master: (121 commits)
  reserved word changes closes #859
  add ordering to the individual queries
  Fixes #852 by not creating a backup file for sed -i
  Ok-more mucking with my path-trying again...
  Fixed local system libs for Gemfile
  Updated gems for 0.8.6
  Bump to 0.8.6.JulietJaguar.
  time parsing tweaks
  tweak time parsing
  Replace concerto-audio with concerto_audio...not sure why that was working...
  Add concerto_template_scheduling to seeds as disabled by default
  fix tz tweak to use times as local times
  Use Ruby 1.8.7 safe Time operations.
  set local zone to UTC for time tests
  use the user or system time zone on each request
  parse the start and ends times as if they are local
  Fixed an oversight of some i18n rubbish for #841
  add gems for scheduling for #835 and #576
  add gems for scheduling for #835 and #576
  add gems for scheduling for #835 and #576
  ...

Conflicts:
	app/views/field_configs/index.html.erb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@augustf @mfrederickson