Merge pull request #570 from rails/flavorjones/ci-fix-202520

ci: Get green (August 2025 edition)

Author: flavorjones

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        plat: ["ubuntu", "windows", "macos"]
+        plat: [ "ubuntu", "macos" ]
     runs-on: ${{matrix.plat}}-latest
     steps:
       - uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        plat: ["ubuntu", "macos"] # TODO: on windows the tailwind upgrader tests are failing
+        plat: [ "ubuntu", "macos" ]
     runs-on: ${{matrix.plat}}-latest
     steps:
       - uses: actions/checkout@v4

test/integration/user_install_test.sh

@@ -6,9 +6,11 @@ set -o pipefail
 set -eux
 
 # set up dependencies
+gem install bcrypt # it's complicated, see Rails 7549ba77. can probably be removed once Rails 8.0 is EOL.
 rm -f Gemfile.lock
 bundle remove actionmailer || true
 bundle remove rails || true
+rm -f Gemfile.lock
 bundle add rails --skip-install ${RAILSOPTS:-}
 bundle install --prefer-local
 bundle exec rails -v
@@ -21,6 +23,7 @@ pushd "My Workspace"
 function prepare_deps {
   # make sure to use the same version of rails (e.g., install from git source if necessary)
   bundle remove rails --skip-install
+  rm -f Gemfile.lock
   bundle add rails --skip-install ${RAILSOPTS:-}
 
   # use the tailwindcss-rails under test

test/integration/user_upgrade_test.sh

@@ -6,9 +6,11 @@ set -o pipefail
 set -eux
 
 # set up dependencies
+gem install bcrypt # it's complicated, see Rails 7549ba77. can probably be removed once Rails 8.0 is EOL.
 rm -f Gemfile.lock
 bundle remove actionmailer || true
 bundle remove rails || true
+rm -f Gemfile.lock
 bundle add rails --skip-install ${RAILSOPTS:-}
 bundle install --prefer-local
 
@@ -24,6 +26,7 @@ pushd test-upgrade
 
 # make sure to use the same version of rails (e.g., install from git source if necessary)
 bundle remove rails --skip-install
+rm -f Gemfile.lock
 bundle add rails --skip-install ${RAILSOPTS:-}
 
 # set up app with tailwindcss-rails v3 and tailwindcss-ruby v3