From 70f884614b380ce3fed89f7219b473f90c25f441 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Mon, 31 Oct 2022 21:44:58 -0400 Subject: [PATCH 1/2] ci: cleanup workaround for broken bundler version --- .github/workflows/gem-install.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml index f32f3e2..ce4fe48 100644 --- a/.github/workflows/gem-install.yml +++ b/.github/workflows/gem-install.yml @@ -74,8 +74,7 @@ jobs: with: name: gem-x86_64-linux path: pkg - - run: "gem update --system" - - run: "apk add build-base" # TODO: remove after https://github.com/rubygems/rubygems/issues/5914 is in a rubygems release + - run: "gem update --system" # let's make sure the latest is working for us (upstream test, see #200) - run: "gem install pkg/tailwindcss-rails-*.gem" - run: "tailwindcss --help" From d535a2a8f3ae0e720d6d72172b8af477b07f18db Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Mon, 31 Oct 2022 16:46:30 -0400 Subject: [PATCH 2/2] native: support for arm-linux and ensure test coverage in the CI pipeline --- .github/workflows/gem-install.yml | 19 ++++++++++++++++++- lib/tailwindcss/upstream.rb | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml index ce4fe48..6f53700 100644 --- a/.github/workflows/gem-install.yml +++ b/.github/workflows/gem-install.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - platform: ["ruby", "x64-mingw32", "x64-mingw-ucrt", "x86_64-darwin", "x86_64-linux"] + platform: ["ruby", "x64-mingw32", "x64-mingw-ucrt", "x86_64-darwin", "x86_64-linux", "arm-linux"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -78,6 +78,23 @@ jobs: - run: "gem install pkg/tailwindcss-rails-*.gem" - run: "tailwindcss --help" + linux-arm-install: + needs: ["package"] + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v3 + 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.1 \ + /bin/bash -c " + set -ex + gem install pkg/tailwindcss-rails-*.gem + tailwindcss --help + " + darwin-install: needs: ["package"] runs-on: macos-latest diff --git a/lib/tailwindcss/upstream.rb b/lib/tailwindcss/upstream.rb index d0afc3e..cd45d7f 100644 --- a/lib/tailwindcss/upstream.rb +++ b/lib/tailwindcss/upstream.rb @@ -11,6 +11,7 @@ module Upstream "x86_64-darwin" => "tailwindcss-macos-x64", "x86_64-linux" => "tailwindcss-linux-x64", "aarch64-linux" => "tailwindcss-linux-arm64", + "arm-linux" => "tailwindcss-linux-armv7", } end end