Skip to content

Commit 3fb454c

Browse files
flavorjonesflavorjones
authored
Merge pull request flavorjones#43 from flavorjones/flavorjones-dep-tailwindcss-v4.0.0-beta.9
dep: update to Tailwind CSS v4.0.0-beta.9, ship separate gnu and musl gems
2 parents d912e8c + 9246374 commit 3fb454c

File tree

5 files changed

+91
-54
lines changed

5 files changed

+91
-54
lines changed

‎.github/workflows/gem-install.yml

Lines changed: 59 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ jobs:
2525
- "x64-mingw-ucrt"
2626
- "x86_64-darwin"
2727
- "arm64-darwin"
28-
- "x86_64-linux"
29-
# - "arm-linux"
28+
- "x86_64-linux-gnu"
29+
- "x86_64-linux-musl"
30+
- "aarch64-linux-gnu"
31+
- "aarch64-linux-musl"
3032
runs-on: ubuntu-latest
3133
steps:
3234
- uses: actions/checkout@v4
@@ -57,7 +59,7 @@ jobs:
5759
- run: "gem install pkg/tailwindcss-ruby-*.gem"
5860
- run: "tailwindcss 2>&1 | fgrep 'ERROR: Cannot find the tailwindcss executable'"
5961

60-
linux-install:
62+
linux-x86_64-gnu-install:
6163
needs: ["package"]
6264
runs-on: ubuntu-latest
6365
steps:
@@ -66,42 +68,65 @@ jobs:
6668
ruby-version: "3.2"
6769
- uses: actions/download-artifact@v4
6870
with:
69-
name: gem-x86_64-linux
71+
name: gem-x86_64-linux-gnu
7072
path: pkg
7173
- run: "gem install pkg/tailwindcss-ruby-*.gem"
7274
- run: "tailwindcss --help"
7375

74-
# linux-musl-install:
75-
# needs: ["package"]
76-
# runs-on: ubuntu-latest
77-
# container:
78-
# image: ruby:3.2-alpine
79-
# steps:
80-
# - uses: actions/download-artifact@v4
81-
# with:
82-
# name: gem-x86_64-linux
83-
# path: pkg
84-
# - run: "apk add build-base" # to compile racc, etc.
85-
# - run: "gem update --system" # let's make sure the latest is working for us (upstream test, see #200)
86-
# - run: "gem install pkg/tailwindcss-ruby-*.gem"
87-
# - run: "tailwindcss --help"
76+
linux-x86_64-musl-install:
77+
needs: ["package"]
78+
runs-on: ubuntu-latest
79+
steps:
80+
- uses: actions/download-artifact@v4
81+
with:
82+
name: gem-x86_64-linux-musl
83+
path: pkg
84+
- run: |
85+
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
86+
ruby:3.2-alpine \
87+
sh -c "
88+
apk add build-base
89+
gem install pkg/tailwindcss-ruby-*.gem
90+
tailwindcss --help
91+
"
92+
93+
linux-aarch64-gnu-install:
94+
needs: ["package"]
95+
runs-on: ubuntu-latest
96+
steps:
97+
- uses: ruby/setup-ruby@v1
98+
with:
99+
ruby-version: "3.2"
100+
- uses: actions/download-artifact@v4
101+
with:
102+
name: gem-aarch64-linux-gnu
103+
path: pkg
104+
- run: |
105+
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
106+
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
107+
--platform=linux/arm64/v8 ruby:3.2 \
108+
sh -c "
109+
gem install pkg/tailwindcss-ruby-*.gem
110+
tailwindcss --help
111+
"
88112
89-
# linux-arm-install:
90-
# needs: ["package"]
91-
# runs-on: ubuntu-latest
92-
# steps:
93-
# - uses: actions/download-artifact@v4
94-
# with:
95-
# name: gem-arm-linux
96-
# path: pkg
97-
# - run: |
98-
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
99-
# docker run --rm -v "$(pwd):/test" -w /test --platform=linux/arm/v7 ruby:3.2 \
100-
# /bin/bash -c "
101-
# set -ex
102-
# gem install pkg/tailwindcss-ruby-*.gem
103-
# tailwindcss --help
104-
# "
113+
linux-aarch64-musl-install:
114+
needs: ["package"]
115+
runs-on: ubuntu-latest
116+
steps:
117+
- uses: actions/download-artifact@v4
118+
with:
119+
name: gem-aarch64-linux-musl
120+
path: pkg
121+
- run: |
122+
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
123+
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
124+
--platform=linux/arm64/v8 ruby:3.2-alpine \
125+
sh -c "
126+
apk add build-base
127+
gem install pkg/tailwindcss-ruby-*.gem
128+
tailwindcss --help
129+
"
105130
106131
darwin-x86_64-install:
107132
needs: ["package"]

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# tailwindcss-ruby changelog
22

3+
## v4.0.0.beta.9
4+
5+
* Update to [Tailwind CSS v4.0.0-beta.9](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.0-beta.9) @flavorjones
6+
7+
Prerelease documentation at https://tailwindcss.com/docs/v4-beta
8+
9+
Note that this upstream release does not provide an armv7 release, nor a musl-compatible binary.
10+
11+
312
## v4.0.0.beta.8
413

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

‎Gemfile.lock

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
PATH
22
remote: .
33
specs:
4-
tailwindcss-ruby (4.0.0.beta.8)
4+
tailwindcss-ruby (4.0.0.beta.9)
55

66
GEM
77
remote: https://rubygems.org/
88
specs:
99
ast (2.4.2)
10-
json (2.9.0)
10+
json (2.9.1)
1111
language_server-protocol (3.17.0.3)
1212
lint_roller (1.1.0)
1313
minitest (5.25.4)
@@ -18,36 +18,38 @@ GEM
1818
racc (1.8.1)
1919
rainbow (3.1.1)
2020
rake (13.2.1)
21-
regexp_parser (2.9.3)
22-
rubocop (1.68.0)
21+
regexp_parser (2.10.0)
22+
rubocop (1.69.2)
2323
json (~> 2.3)
2424
language_server-protocol (>= 3.17.0)
2525
parallel (~> 1.10)
2626
parser (>= 3.3.0.2)
2727
rainbow (>= 2.2.2, < 4.0)
28-
regexp_parser (>= 2.4, < 3.0)
29-
rubocop-ast (>= 1.32.2, < 2.0)
28+
regexp_parser (>= 2.9.3, < 3.0)
29+
rubocop-ast (>= 1.36.2, < 2.0)
3030
ruby-progressbar (~> 1.7)
31-
unicode-display_width (>= 2.4.0, < 3.0)
32-
rubocop-ast (1.36.2)
31+
unicode-display_width (>= 2.4.0, < 4.0)
32+
rubocop-ast (1.37.0)
3333
parser (>= 3.3.1.0)
34-
rubocop-performance (1.22.1)
34+
rubocop-performance (1.23.1)
3535
rubocop (>= 1.48.1, < 2.0)
3636
rubocop-ast (>= 1.31.1, < 2.0)
3737
ruby-progressbar (1.13.0)
38-
standard (1.42.1)
38+
standard (1.43.0)
3939
language_server-protocol (~> 3.17.0.2)
4040
lint_roller (~> 1.0)
41-
rubocop (~> 1.68.0)
41+
rubocop (~> 1.69.1)
4242
standard-custom (~> 1.0.0)
43-
standard-performance (~> 1.5)
43+
standard-performance (~> 1.6)
4444
standard-custom (1.0.2)
4545
lint_roller (~> 1.0)
4646
rubocop (~> 1.50)
47-
standard-performance (1.5.0)
47+
standard-performance (1.6.0)
4848
lint_roller (~> 1.1)
49-
rubocop-performance (~> 1.22.0)
50-
unicode-display_width (2.6.0)
49+
rubocop-performance (~> 1.23.0)
50+
unicode-display_width (3.1.3)
51+
unicode-emoji (~> 4.0, >= 4.0.4)
52+
unicode-emoji (4.0.4)
5153

5254
PLATFORMS
5355
ruby

‎lib/tailwindcss/ruby/upstream.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
module Tailwindcss
22
module Ruby
33
module Upstream
4-
VERSION = "v4.0.0-beta.8"
4+
VERSION = "v4.0.0-beta.9"
55

66
# rubygems platform name => upstream release filename
77
NATIVE_PLATFORMS = {
88
"arm64-darwin" => "tailwindcss-macos-arm64",
99
"x64-mingw32" => "tailwindcss-windows-x64.exe",
1010
"x64-mingw-ucrt" => "tailwindcss-windows-x64.exe",
1111
"x86_64-darwin" => "tailwindcss-macos-x64",
12-
"x86_64-linux" => "tailwindcss-linux-x64",
13-
"aarch64-linux" => "tailwindcss-linux-arm64",
14-
# "arm-linux" => "tailwindcss-linux-armv7",
12+
"x86_64-linux-gnu" => "tailwindcss-linux-x64",
13+
"x86_64-linux-musl" => "tailwindcss-linux-x64-musl",
14+
"aarch64-linux-gnu" => "tailwindcss-linux-arm64",
15+
"aarch64-linux-musl" => "tailwindcss-linux-arm64-musl",
1516
}
1617
end
1718
end

‎lib/tailwindcss/ruby/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
module Tailwindcss
44
module Ruby
5-
VERSION = "4.0.0.beta.8"
5+
VERSION = "4.0.0.beta.9"
66
end
77
end

0 commit comments

Comments
 (0)