Skip to content

Commit 8005407

Browse files
authored
Merge pull request #774 from lcreid/demo-app-without-gemfile
Remove Gemfile from demo/
2 parents c3399fb + b67139a commit 8005407

File tree

7 files changed

+18
-359
lines changed

7 files changed

+18
-359
lines changed

.github/workflows/ruby.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
env:
1212
BUNDLE_GEMFILE: gemfiles/7.2.gemfile
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v5
1515
with:
1616
fetch-depth: 0
1717
- uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: 3.2.9
19+
ruby-version: 3.2
2020
bundler-cache: true
2121
# Disabled since it requires access not granted by GitHub Actions for PRs
2222
# - name: Danger
@@ -37,7 +37,7 @@ jobs:
3737
env:
3838
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v5
4141
- name: Set up Ruby
4242
uses: ruby/setup-ruby@v1
4343
with:
@@ -48,13 +48,15 @@ jobs:
4848
Demo:
4949
runs-on: ubuntu-latest
5050
steps:
51-
- uses: actions/checkout@v3
51+
- uses: actions/checkout@v5
5252
- name: Set up Ruby
5353
uses: ruby/setup-ruby@v1
5454
with:
5555
working-directory: demo
5656
bundler-cache: true
57-
ruby-version: 3.4.2
57+
ruby-version: 3.4
58+
env:
59+
BUNDLE_GEMFILE: '../Gemfile'
5860
- name: Run tests
5961
working-directory: demo
6062
run: bundle exec rake test:all

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ eval File.read(gems), binding, gems # rubocop: disable Security/Eval
44
require "#{__dir__}/lib/bootstrap_form/version"
55

66
gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
7+
gem "cssbundling-rails"
78
gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
9+
gem "jsbundling-rails"
810
gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
911
gem "rails", BootstrapForm::REQUIRED_RAILS_VERSION
1012
gem "propshaft"

demo/Gemfile

Lines changed: 0 additions & 32 deletions
This file was deleted.

demo/Gemfile.lock

Lines changed: 0 additions & 313 deletions
This file was deleted.

0 commit comments

Comments
 (0)