Skip to content
Closed
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
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ jobs:
runs-on: ${{matrix.plat}}-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.4"
Expand All @@ -55,6 +58,9 @@ jobs:
runs-on: ${{matrix.plat}}-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.4"
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,38 @@ jobs:

user-install:
name: "user-install (rails ${{ matrix.ref }})"
runs-on: ${{matrix.plat}}-latest
runs-on: ubuntu-latest
container:
image: ruby:3.4
strategy:
fail-fast: false
matrix:
plat: ["ubuntu"]
ref: ["7-2-stable", "8-0-stable", "main"]
env:
RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
- uses: actions/setup-node@v4
with:
ruby-version: "3.3"
bundler: latest
node-version: 20
- run: test/integration/user_install_test.sh
shell: bash

user-upgrade:
name: "user-upgrade (rails ${{ matrix.ref }})"
runs-on: ${{matrix.plat}}-latest
runs-on: ubuntu-latest
container:
image: ruby:3.4
strategy:
fail-fast: false
matrix:
plat: ["ubuntu"]
ref: ["7-2-stable", "8-0-stable", "main"]
env:
RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
- uses: actions/setup-node@v4
with:
ruby-version: "3.3"
bundler: latest
node-version: 20
- run: test/integration/user_upgrade_test.sh
shell: bash
3 changes: 2 additions & 1 deletion test/integration/user_upgrade_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ bundle remove actionmailer || true
bundle remove rails || true
bundle add rails --skip-install ${RAILSOPTS:-}
bundle install --prefer-local
npm uninstall tailwindcss

# do our work a directory with spaces in the name (#176, #184)
rm -rf "My Workspace"
Expand Down Expand Up @@ -52,7 +53,7 @@ bundle remove tailwindcss-rails --skip-install
bundle remove tailwindcss-ruby --skip-install

bundle add tailwindcss-rails --skip-install --path="../.."
bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:---version 4.0.0}
bundle add tailwindcss-ruby --skip-install ${TAILWINDCSSOPTS:---version 4.0.17}

bundle install --prefer-local
bundle show --paths | fgrep tailwind
Expand Down
Loading