Skip to content

Commit 5c63a24

Browse files
authored
Merge pull request #472 from rails/flavorjones-ci-restore-bundler-args-injection
test: restore the ability to inject tailwindcss-ruby bundler opts
2 parents 65dd6c5 + a9f3a0f commit 5c63a24

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Diff for: test/integration/user_install_test.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ bundle add rails --skip-install ${RAILSOPTS:-}
2727

2828
# use the tailwindcss-rails under test
2929
bundle add tailwindcss-rails --skip-install --path="../.."
30+
bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:-}
3031
bundle install --prefer-local
31-
bundle show --paths
32+
bundle show --paths | fgrep tailwind
3233
bundle binstubs --all
3334

3435
# install tailwindcss

Diff for: test/integration/user_upgrade_test.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bundle add rails --skip-install ${RAILSOPTS:-}
2929
bundle add tailwindcss-rails --skip-install --version 3.3.0
3030
bundle add tailwindcss-ruby --skip-install --version 3.4.17
3131
bundle install --prefer-local
32-
bundle show --paths
32+
bundle show --paths | fgrep tailwind
3333
bundle binstubs --all
3434

3535
# install tailwindcss
@@ -51,10 +51,10 @@ bundle remove tailwindcss-rails --skip-install
5151
bundle remove tailwindcss-ruby --skip-install
5252

5353
bundle add tailwindcss-rails --skip-install --path="../.."
54-
bundle add tailwindcss-ruby --skip-install --version 4.0.0
54+
bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:---version 4.0.0}
5555

5656
bundle install --prefer-local
57-
bundle show --paths
57+
bundle show --paths | fgrep tailwind
5858
bundle binstubs --all
5959

6060
# create a postcss file

0 commit comments

Comments
 (0)