Skip to content

dep: update to Tailwind CSS v4.0.0-beta.9, ship separate gnu and musl gems #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 59 additions & 34 deletions .github/workflows/gem-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ jobs:
- "x64-mingw-ucrt"
- "x86_64-darwin"
- "arm64-darwin"
- "x86_64-linux"
# - "arm-linux"
- "x86_64-linux-gnu"
- "x86_64-linux-musl"
- "aarch64-linux-gnu"
- "aarch64-linux-musl"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -57,7 +59,7 @@ jobs:
- run: "gem install pkg/tailwindcss-ruby-*.gem"
- run: "tailwindcss 2>&1 | fgrep 'ERROR: Cannot find the tailwindcss executable'"

linux-install:
linux-x86_64-gnu-install:
needs: ["package"]
runs-on: ubuntu-latest
steps:
Expand All @@ -66,42 +68,65 @@ jobs:
ruby-version: "3.2"
- uses: actions/download-artifact@v4
with:
name: gem-x86_64-linux
name: gem-x86_64-linux-gnu
path: pkg
- run: "gem install pkg/tailwindcss-ruby-*.gem"
- run: "tailwindcss --help"

# linux-musl-install:
# needs: ["package"]
# runs-on: ubuntu-latest
# container:
# image: ruby:3.2-alpine
# steps:
# - uses: actions/download-artifact@v4
# with:
# name: gem-x86_64-linux
# path: pkg
# - run: "apk add build-base" # to compile racc, etc.
# - run: "gem update --system" # let's make sure the latest is working for us (upstream test, see #200)
# - run: "gem install pkg/tailwindcss-ruby-*.gem"
# - run: "tailwindcss --help"
linux-x86_64-musl-install:
needs: ["package"]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: gem-x86_64-linux-musl
path: pkg
- run: |
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
ruby:3.2-alpine \
sh -c "
apk add build-base
gem install pkg/tailwindcss-ruby-*.gem
tailwindcss --help
"

linux-aarch64-gnu-install:
needs: ["package"]
runs-on: ubuntu-latest
steps:
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
- uses: actions/download-artifact@v4
with:
name: gem-aarch64-linux-gnu
path: pkg
- run: |
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
--platform=linux/arm64/v8 ruby:3.2 \
sh -c "
gem install pkg/tailwindcss-ruby-*.gem
tailwindcss --help
"

# linux-arm-install:
# needs: ["package"]
# runs-on: ubuntu-latest
# steps:
# - uses: actions/download-artifact@v4
# with:
# name: gem-arm-linux
# path: pkg
# - run: |
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
# docker run --rm -v "$(pwd):/test" -w /test --platform=linux/arm/v7 ruby:3.2 \
# /bin/bash -c "
# set -ex
# gem install pkg/tailwindcss-ruby-*.gem
# tailwindcss --help
# "
linux-aarch64-musl-install:
needs: ["package"]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: gem-aarch64-linux-musl
path: pkg
- run: |
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
--platform=linux/arm64/v8 ruby:3.2-alpine \
sh -c "
apk add build-base
gem install pkg/tailwindcss-ruby-*.gem
tailwindcss --help
"

darwin-x86_64-install:
needs: ["package"]
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# tailwindcss-ruby changelog

## v4.0.0.beta.9

* Update to [Tailwind CSS v4.0.0-beta.9](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.0-beta.9) @flavorjones

Prerelease documentation at https://tailwindcss.com/docs/v4-beta

Note that this upstream release does not provide an armv7 release, nor a musl-compatible binary.


## v4.0.0.beta.8

* Update to [Tailwind CSS v4.0.0-beta.8](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.0-beta.8) @flavorjones
Expand Down
32 changes: 17 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
PATH
remote: .
specs:
tailwindcss-ruby (4.0.0.beta.8)
tailwindcss-ruby (4.0.0.beta.9)

GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
json (2.9.0)
json (2.9.1)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
minitest (5.25.4)
Expand All @@ -18,36 +18,38 @@ GEM
racc (1.8.1)
rainbow (3.1.1)
rake (13.2.1)
regexp_parser (2.9.3)
rubocop (1.68.0)
regexp_parser (2.10.0)
rubocop (1.69.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.36.2)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
rubocop-performance (1.22.1)
rubocop-performance (1.23.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
standard (1.42.1)
standard (1.43.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.68.0)
rubocop (~> 1.69.1)
standard-custom (~> 1.0.0)
standard-performance (~> 1.5)
standard-performance (~> 1.6)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.5.0)
standard-performance (1.6.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.22.0)
unicode-display_width (2.6.0)
rubocop-performance (~> 1.23.0)
unicode-display_width (3.1.3)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)

PLATFORMS
ruby
Expand Down
9 changes: 5 additions & 4 deletions lib/tailwindcss/ruby/upstream.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
module Tailwindcss
module Ruby
module Upstream
VERSION = "v4.0.0-beta.8"
VERSION = "v4.0.0-beta.9"

# rubygems platform name => upstream release filename
NATIVE_PLATFORMS = {
"arm64-darwin" => "tailwindcss-macos-arm64",
"x64-mingw32" => "tailwindcss-windows-x64.exe",
"x64-mingw-ucrt" => "tailwindcss-windows-x64.exe",
"x86_64-darwin" => "tailwindcss-macos-x64",
"x86_64-linux" => "tailwindcss-linux-x64",
"aarch64-linux" => "tailwindcss-linux-arm64",
# "arm-linux" => "tailwindcss-linux-armv7",
"x86_64-linux-gnu" => "tailwindcss-linux-x64",
"x86_64-linux-musl" => "tailwindcss-linux-x64-musl",
"aarch64-linux-gnu" => "tailwindcss-linux-arm64",
"aarch64-linux-musl" => "tailwindcss-linux-arm64-musl",
}
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/tailwindcss/ruby/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Tailwindcss
module Ruby
VERSION = "4.0.0.beta.8"
VERSION = "4.0.0.beta.9"
end
end
Loading