Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@ updates:
interval: "weekly"
day: "monday"
time: "06:00"
env:
DEPENDABOT_JOB: "true"
commit-message:
prefix: chore
# TODO - add labels
# labels:
# - "dependencies"
# - "ruby"
# - "automated-pr"
open-pull-requests-limit: 5

# 2. Update GitHub Actions (keeps your CI workflows secure)
Expand Down
12 changes: 7 additions & 5 deletions govuk_tech_docs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ lib = File.expand_path("lib", __dir__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require "govuk_tech_docs/version"

`npm ci`
abort "npm ci failed" unless $CHILD_STATUS.success?
if ENV["DEPENDABOT_JOB"] == "true" # dependabot will only evaluate the bundler, and will not allow npm
warn "Skipping npm ci due to DEPENDABOT_JOB=true"
else
system("npm ci")
abort "npm ci failed" unless $CHILD_STATUS.success?
end

unless File.exist?("node_modules/govuk-frontend/dist/govuk/_base.scss")
abort "govuk-frontend npm package not installed"
Expand Down Expand Up @@ -45,9 +49,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "middleman-compass"
spec.add_dependency "middleman-livereload"
spec.add_dependency "middleman-search-gds"
=begin
middleman-sprockets is very old and out of date. V4.1.0 has a breaking change. Will look to replace with gem "dartsass-sprockets" or uses sass in the package.json
=end
# middleman-sprockets is very old and out of date. V4.1.0 has a breaking change. Will look to replace with gem "dartsass-sprockets" or uses sass in the package.json
spec.add_dependency "middleman-sprockets", "4.0.0"
spec.add_dependency "middleman-syntax"
spec.add_dependency "mutex_m" # TODO: remove once activesupport declares this itself.
Expand Down
Loading