From 21e9c87c7f321bbe7077636d0cad8e2dd491b9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 2 Oct 2020 11:38:30 +0200 Subject: [PATCH 1/2] Fix incorrect dependency in bug report template Bundler 2.2.0 resolves all platforms by default, so it will raise an error for this inline Gemfile. --- tasks/bug_report_template.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/bug_report_template.rb b/tasks/bug_report_template.rb index a090c5d7200..edee056944c 100644 --- a/tasks/bug_report_template.rb +++ b/tasks/bug_report_template.rb @@ -16,7 +16,7 @@ gem "sprockets", "3.7.2" gem "sassc-rails", "2.1.2" gem "sqlite3", "1.4.1", platform: :mri - gem "activerecord-jdbcsqlite3-adapter", "52.0", platform: :jruby + gem "activerecord-jdbcsqlite3-adapter", "60.0", platform: :jruby gem "jruby-openssl", "0.10.1", platform: :jruby end From f308fda20061bc96d96dbca7c90fa22b7e21b2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 28 Sep 2020 10:50:21 +0200 Subject: [PATCH 2/2] Use bundler 2.2.0.rc.1 There's a bug in the `rake release` task that's fixed in the latest bundler rc release and it's preventing me from releasing. I get this: ``` $ bin/rake release activeadmin 2.8.1 built to pkg/activeadmin-2.8.1.gem. Tagged v2.8.1. Untagging v2.8.1 due to error. rake aborted! Couldn't git push. `git push --tags' failed with the following output: To https://github.com/activeadmin/activeadmin * [new tag] v2.8.1 -> v2.8.1 ! [rejected] v2.7.0 -> v2.7.0 (already exists) error: failed to push some refs to 'https://github.com/activeadmin/activeadmin' hint: Updates were rejected because the tag already exists in the remote. ``` I think I could also fix it by messing with my local tags, but I'd like to try the bundler rc release too. --- .circleci/config.yml | 2 +- Gemfile.lock | 2 +- gemfiles/rails_52/Gemfile.lock | 2 +- gemfiles/rails_60_turbolinks/Gemfile.lock | 2 +- gemfiles/rails_60_webpacker/Gemfile.lock | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e74ccc514e..99d4649fba4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ version: 2.1 .install_bundler: &install_bundler run: name: Install a specific bundler version - command: gem install bundler -v 2.1.4 + command: gem install bundler -v 2.2.0.rc.1 .install_build_deps: &install_build_deps run: diff --git a/Gemfile.lock b/Gemfile.lock index 59f92d54bf2..17bb5f2fd9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -521,4 +521,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.1.4 + 2.2.0.rc.1 diff --git a/gemfiles/rails_52/Gemfile.lock b/gemfiles/rails_52/Gemfile.lock index 04561cda747..5c2dd482272 100644 --- a/gemfiles/rails_52/Gemfile.lock +++ b/gemfiles/rails_52/Gemfile.lock @@ -423,4 +423,4 @@ DEPENDENCIES sqlite3 (~> 1.4) BUNDLED WITH - 2.1.4 + 2.2.0.rc.1 diff --git a/gemfiles/rails_60_turbolinks/Gemfile.lock b/gemfiles/rails_60_turbolinks/Gemfile.lock index b38fce5c64a..ec0b4abd60a 100644 --- a/gemfiles/rails_60_turbolinks/Gemfile.lock +++ b/gemfiles/rails_60_turbolinks/Gemfile.lock @@ -443,4 +443,4 @@ DEPENDENCIES turbolinks (~> 5.2) BUNDLED WITH - 2.1.4 + 2.2.0.rc.1 diff --git a/gemfiles/rails_60_webpacker/Gemfile.lock b/gemfiles/rails_60_webpacker/Gemfile.lock index 5bc1114a13f..44c127c3178 100644 --- a/gemfiles/rails_60_webpacker/Gemfile.lock +++ b/gemfiles/rails_60_webpacker/Gemfile.lock @@ -448,4 +448,4 @@ DEPENDENCIES webpacker (~> 5.1) BUNDLED WITH - 2.1.4 + 2.2.0.rc.1