Skip to content

Commit ef38e36

Browse files
committed
Ship separate linux-gnu and linux-musl gems
Also backfill CI tests for aarch64-linux-* gems.
1 parent 6b0c8ff commit ef38e36

File tree

2 files changed

+64
-37
lines changed

2 files changed

+64
-37
lines changed

.github/workflows/gem-install.yml

Lines changed: 60 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,66 @@ 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 --privileged multiarch/qemu-user-static --reset -p yes
86+
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
87+
--platform=linux/arm64/v8 ruby:3.2 \
88+
sh -c "
89+
apk add build-base
90+
gem install pkg/tailwindcss-ruby-*.gem
91+
tailwindcss --help
92+
"
93+
94+
linux-aarch64-gnu-install:
95+
needs: ["package"]
96+
runs-on: ubuntu-latest
97+
steps:
98+
- uses: ruby/setup-ruby@v1
99+
with:
100+
ruby-version: "3.2"
101+
- uses: actions/download-artifact@v4
102+
with:
103+
name: gem-aarch64-linux-gnu
104+
path: pkg
105+
- run: |
106+
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
107+
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
108+
--platform=linux/arm64/v8 ruby:3.2 \
109+
sh -c "
110+
gem install pkg/tailwindcss-ruby-*.gem
111+
tailwindcss --help
112+
"
88113
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-
# "
114+
linux-aarch64-musl-install:
115+
needs: ["package"]
116+
runs-on: ubuntu-latest
117+
steps:
118+
- uses: actions/download-artifact@v4
119+
with:
120+
name: gem-aarch64-linux-musl
121+
path: pkg
122+
- run: |
123+
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
124+
docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \
125+
--platform=linux/arm64/v8 ruby:3.2-alpine \
126+
sh -c "
127+
apk add build-base
128+
gem install pkg/tailwindcss-ruby-*.gem
129+
tailwindcss --help
130+
"
105131
106132
darwin-x86_64-install:
107133
needs: ["package"]

lib/tailwindcss/ruby/upstream.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ module Upstream
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",
1516
}
1617
end
1718
end

0 commit comments

Comments
 (0)