From a6ead3fb1bdf4aec8282cd766f78dd7ba11c4de3 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 23 Jan 2025 15:14:22 -0500 Subject: [PATCH 1/3] ci: trigger on pushes to v*-stable branches --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3889c27c..05739def 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: push: branches: - main + - v*-stable tags: - v*.*.* pull_request: From 1f694adb4d7cd616f1e71804c70bcf65f0b7541a Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 23 Jan 2025 15:12:19 -0500 Subject: [PATCH 2/3] dep: pin tailwindcss-ruby to `~> 3.0` to avoid unintentional upgrades to Tailwind v4 --- tailwindcss-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwindcss-rails.gemspec b/tailwindcss-rails.gemspec index 8d893029..0077df2a 100644 --- a/tailwindcss-rails.gemspec +++ b/tailwindcss-rails.gemspec @@ -19,5 +19,5 @@ Gem::Specification.new do |spec| spec.files = Dir["{app,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] spec.add_dependency "railties", ">= 7.0.0" - spec.add_dependency "tailwindcss-ruby" + spec.add_dependency "tailwindcss-ruby", "~> 3.0" end From c2dfc6df95126a619ce4f9658806caca715fcea9 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 23 Jan 2025 15:17:40 -0500 Subject: [PATCH 3/3] ci: drop the tailwind v4 compatibility tests --- .github/workflows/ci.yml | 2 +- .github/workflows/upstream.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05739def..04d5060e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: fail-fast: false matrix: plat: ["ubuntu", "windows", "macos"] - tailwind: ["--version=~>3.4.14", "--version=~>4.0.0.alpha.27"] + tailwind: ["--version=~>3.4.14"] runs-on: ${{matrix.plat}}-latest env: TAILWINDCSSOPTS: ${{ matrix.tailwind }} diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml index 5c213e6e..a1bae4ca 100644 --- a/.github/workflows/upstream.yml +++ b/.github/workflows/upstream.yml @@ -42,7 +42,7 @@ jobs: matrix: plat: ["ubuntu"] ref: ["7-2-stable", "8-0-stable", "main"] - tailwind: ["--version=~>3.4.14", "--version=~>4.0.0.alpha.27"] + tailwind: ["--version=~>3.4.14"] env: RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }} TAILWINDCSSOPTS: ${{ matrix.tailwind }}