Skip to content

Commit

Permalink
Merge pull request #526 from alphagov/merger-v2
Browse files Browse the repository at this point in the history
Upgrade to govuk-dependabot-merger v2
  • Loading branch information
MuriloDalRi authored Apr 16, 2024
2 parents 4daf2f5 + cd96040 commit 248c983
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@
/log/*
!/log/.keep
/tmp

# simplecov
coverage/
10 changes: 4 additions & 6 deletions .govuk_dependabot_merger.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
api_version: 1
auto_merge:
- dependency: rubocop-govuk
allowed_semver_bumps:
- patch
- minor
api_version: 2
defaults:
auto_merge: true
update_external_dependencies: true
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ group :test do
gem "pry-byebug"
gem "rake"
gem "rspec"
gem "simplecov", require: false
gem "timecop"
gem "webmock"
end
8 changes: 8 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ GEM
bigdecimal
rexml
diff-lcs (1.5.1)
docile (1.4.0)
drb (2.2.1)
fakefs (2.5.0)
faraday (2.9.0)
Expand Down Expand Up @@ -122,6 +123,12 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
slack-poster (2.2.2)
faraday (>= 1.0.0)
timecop (0.9.8)
Expand All @@ -146,6 +153,7 @@ DEPENDENCIES
rake
rspec
rubocop-govuk
simplecov
slack-poster
timecop
webmock
Expand Down
2 changes: 2 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#
require "timecop"
require "pry-byebug"
require "simplecov"
SimpleCov.start

ENV["SEAL_ORGANISATION"] ||= "alphagov"

Expand Down

0 comments on commit 248c983

Please sign in to comment.