Skip to content

Commit

Permalink
Continue rejigging the lock files
Browse files Browse the repository at this point in the history
  • Loading branch information
alexwlchan committed Apr 9, 2024
1 parent 065f94d commit 73ec5bf
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
name: Build the website
runs-on: ubuntu-latest
env:
BUNDLE_WITHOUT: lint
BUNDLE_WITH: build
steps:
- name: "Check out the repo"
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
name: Lint the Ruby code
runs-on: ubuntu-latest
env:
BUNDLE_WITHOUT: build
BUNDLE_WITH: lint
steps:
- name: "Check out the repo"
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_plugin_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Run plugin tests
runs-on: ubuntu-latest
env:
BUNDLE_WITHOUT: lint
BUNDLE_WITH: build:test
steps:
- name: "Check out the repo"
uses: actions/checkout@v4
Expand Down Expand Up @@ -52,4 +52,4 @@ jobs:
- run: pip install -r requirements.txt

- name: "Run the plugin tests"
run: bundle exec ruby src/_tests/tests.rb
run: ruby src/_tests/tests.rb
15 changes: 10 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

group :build do
group :build, optional: true do do
gem 'chunky_png', '~> 1.4'
gem 'color', '~> 1.8'
gem 'html-proofer', '~> 5'
Expand All @@ -11,14 +11,19 @@ group :build do
gem 'shell-executer', '~> 1.0'
end

group :lint do
group :lint, optional: true do do
gem 'rubocop', '~> 1.63'

# This dependency is specifically for CI in GitHub Actions; I don't
# These dependencies are specifically for CI in GitHub Actions; I don't
# need it when I'm running locally. If I try to run `bundle exec rubocop`
# in CI without it, I get an error:
# in CI without it, I get errors like:
#
# cannot load such file -- rubocop-minitest
#
gem 'rubocop-minitest', '~> 0.35.0'
gem 'rubocop-minitest'
gem 'rubocop-performance'
end

group :test, optional: true do do
gem 'test-unit'
end
10 changes: 9 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
power_assert (2.0.3)
public_suffix (5.0.5)
racc (1.7.3)
rainbow (3.1.1)
Expand All @@ -128,6 +129,9 @@ GEM
rubocop-minitest (0.35.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-performance (1.21.0)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
Expand All @@ -140,6 +144,8 @@ GEM
open4
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
test-unit (3.6.2)
power_assert
timers (4.3.5)
ttfunk (1.8.0)
bigdecimal (~> 3.1)
Expand All @@ -162,8 +168,10 @@ DEPENDENCIES
json-schema (~> 4)
nokogiri (~> 1.16)
rubocop (~> 1.63)
rubocop-minitest (~> 0.35.0)
rubocop-minitest
rubocop-performance
shell-executer (~> 1.0)
test-unit

BUNDLED WITH
2.3.26

0 comments on commit 73ec5bf

Please sign in to comment.