Skip to content

Commit

Permalink
Fix Gemfile.lock's missing JRuby dependencies; fix release script and…
Browse files Browse the repository at this point in the history
… add check
  • Loading branch information
bensheldon committed May 22, 2021
1 parent 1372438 commit 77acd70
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
13 changes: 10 additions & 3 deletions Gemfile.lock
Expand Up @@ -68,6 +68,11 @@ GEM
activerecord (6.1.3.2)
activemodel (= 6.1.3.2)
activesupport (= 6.1.3.2)
activerecord-jdbc-adapter (61.0-java)
activerecord (~> 6.1.0)
activerecord-jdbcpostgresql-adapter (61.0-java)
activerecord-jdbc-adapter (= 61.0)
jdbc-postgres (>= 9.4, < 43)
activestorage (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
Expand Down Expand Up @@ -176,6 +181,7 @@ GEM
html_tokenizer (0.0.7)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jdbc-postgres (42.2.14)
kramdown (2.3.1)
rexml
kramdown-parser-gfm (1.1.0)
Expand Down Expand Up @@ -203,14 +209,15 @@ GEM
mixlib-shellout (3.2.5)
chef-utils
msgpack (1.4.2)
msgpack (1.4.2-java)
multi_json (1.15.0)
multipart-post (2.1.1)
nio4r (2.5.7)
nio4r (2.5.7-java)
nokogiri (1.11.3)
nokogiri (1.11.5)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.3-java)
nokogiri (1.11.5-java)
racc (~> 1.4)
octokit (4.21.0)
faraday (>= 0.9)
Expand Down Expand Up @@ -397,4 +404,4 @@ DEPENDENCIES
yard-activesupport-concern

BUNDLED WITH
2.2.11
2.2.17
9 changes: 8 additions & 1 deletion Rakefile
Expand Up @@ -41,7 +41,14 @@ task :release, [:version_bump] do |_t, args|
system! ENV, "bundle exec github_changelog_generator --user bensheldon --project good_job --future-release v#{GoodJob::VERSION}"

puts "\n== Updating Gemfile.lock version =="
system! "bundle install"
system! "bundle update --conservative good_job"

puts "\n== Verifying Gemfile.lock =="
gemfile_lock = File.read(File.join(File.dirname(__FILE__), '.ruby-version'))
unless gemfile_lock.include?("jdbc-postgres")
puts "ABORTING...\nMissing JRuby library. Gemfile.lock has possibly been corrupted. Inspect the diff."
exit(1)
end

puts "\n== Creating git commit =="
system! "git add lib/good_job/version.rb CHANGELOG.md Gemfile.lock"
Expand Down

0 comments on commit 77acd70

Please sign in to comment.