test: matrix tailwind 3.4 and 4.0 in integration test

rails · Oct 17, 2024 · dbb0138 · dbb0138
1 parent a6baeb5
commit dbb0138
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,10 @@ jobs:
       fail-fast: false
       matrix:
         plat: ["ubuntu", "windows", "macos"]
+        tailwind: ["--version='~>3.4.14'", "--version='~>4.0.0.alpha.27'"]
+    env:
     runs-on: ${{matrix.plat}}-latest
+      TAILWINDCSSOPTS: ${{ matrix.tailwind }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
@@ -42,8 +42,10 @@ jobs:
       matrix:
         plat: ["ubuntu"]
         ref: ["7-2-stable", "v8.0.0.beta1", "main"]
+        tailwind: ["--version='~>3.4.14'", "--version='~>4.0.0.alpha.27'"]
     env:
       RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
+      TAILWINDCSSOPTS: ${{ matrix.tailwind }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

diff --git a/test/integration/user_journey_test.sh b/test/integration/user_journey_test.sh
@@ -26,7 +26,8 @@ bundle remove rails --skip-install
 bundle add rails --skip-install ${RAILSOPTS:-}
 
 # use the tailwindcss-rails under test
-bundle add tailwindcss-rails --path="../.."
+bundle add tailwindcss-rails --skip-install --path="../.."
+bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:-}
 bundle install
 bundle show --paths
 bundle binstubs --all