From 1f39351c7f81bfc1838bd2a722debf4a0e20f51e Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Sat, 5 Apr 2025 10:39:47 -0400
Subject: [PATCH] ci: install/upgrade tests use a ruby image

and install a node environment using setup-node
---
 .github/workflows/ci.yml              |  6 ++++++
 .github/workflows/upstream.yml        | 20 ++++++++++----------
 test/integration/user_upgrade_test.sh |  3 ++-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3822e414..82dfd642 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,6 +40,9 @@ jobs:
     runs-on: ${{matrix.plat}}-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.4"
@@ -55,6 +58,9 @@ jobs:
     runs-on: ${{matrix.plat}}-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.4"
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index e1b12dea..ce57e4e1 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -36,38 +36,38 @@ jobs:
 
   user-install:
     name: "user-install (rails ${{ matrix.ref }})"
-    runs-on: ${{matrix.plat}}-latest
+    runs-on: ubuntu-latest
+    container:
+      image: ruby:3.4
     strategy:
       fail-fast: false
       matrix:
-        plat: ["ubuntu"]
         ref: ["7-2-stable", "8-0-stable", "main"]
     env:
       RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
     steps:
       - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/setup-node@v4
         with:
-          ruby-version: "3.3"
-          bundler: latest
+          node-version: 20
       - run: test/integration/user_install_test.sh
         shell: bash
 
   user-upgrade:
     name: "user-upgrade (rails ${{ matrix.ref }})"
-    runs-on: ${{matrix.plat}}-latest
+    runs-on: ubuntu-latest
+    container:
+      image: ruby:3.4
     strategy:
       fail-fast: false
       matrix:
-        plat: ["ubuntu"]
         ref: ["7-2-stable", "8-0-stable", "main"]
     env:
       RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
     steps:
       - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/setup-node@v4
         with:
-          ruby-version: "3.3"
-          bundler: latest
+          node-version: 20
       - run: test/integration/user_upgrade_test.sh
         shell: bash
diff --git a/test/integration/user_upgrade_test.sh b/test/integration/user_upgrade_test.sh
index d6017efc..e55c3db2 100755
--- a/test/integration/user_upgrade_test.sh
+++ b/test/integration/user_upgrade_test.sh
@@ -11,6 +11,7 @@ bundle remove actionmailer || true
 bundle remove rails || true
 bundle add rails --skip-install ${RAILSOPTS:-}
 bundle install --prefer-local
+npm uninstall tailwindcss
 
 # do our work a directory with spaces in the name (#176, #184)
 rm -rf "My Workspace"
@@ -52,7 +53,7 @@ bundle remove tailwindcss-rails --skip-install
 bundle remove tailwindcss-ruby --skip-install
 
 bundle add tailwindcss-rails --skip-install --path="../.."
-bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:---version 4.0.0}
+bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:---version 4.0.17}
 
 bundle install --prefer-local
 bundle show --paths | fgrep tailwind