Skip to content

Commit 1f39351

Browse files
committed
ci: install/upgrade tests use a ruby image
and install a node environment using setup-node
1 parent d08ca11 commit 1f39351

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

.github/workflows/ci.yml

+6
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
runs-on: ${{matrix.plat}}-latest
4141
steps:
4242
- uses: actions/checkout@v4
43+
- uses: actions/setup-node@v4
44+
with:
45+
node-version: 20
4346
- uses: ruby/setup-ruby@v1
4447
with:
4548
ruby-version: "3.4"
@@ -55,6 +58,9 @@ jobs:
5558
runs-on: ${{matrix.plat}}-latest
5659
steps:
5760
- uses: actions/checkout@v4
61+
- uses: actions/setup-node@v4
62+
with:
63+
node-version: 20
5864
- uses: ruby/setup-ruby@v1
5965
with:
6066
ruby-version: "3.4"

.github/workflows/upstream.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,38 @@ jobs:
3636

3737
user-install:
3838
name: "user-install (rails ${{ matrix.ref }})"
39-
runs-on: ${{matrix.plat}}-latest
39+
runs-on: ubuntu-latest
40+
container:
41+
image: ruby:3.4
4042
strategy:
4143
fail-fast: false
4244
matrix:
43-
plat: ["ubuntu"]
4445
ref: ["7-2-stable", "8-0-stable", "main"]
4546
env:
4647
RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
4748
steps:
4849
- uses: actions/checkout@v4
49-
- uses: ruby/setup-ruby@v1
50+
- uses: actions/setup-node@v4
5051
with:
51-
ruby-version: "3.3"
52-
bundler: latest
52+
node-version: 20
5353
- run: test/integration/user_install_test.sh
5454
shell: bash
5555

5656
user-upgrade:
5757
name: "user-upgrade (rails ${{ matrix.ref }})"
58-
runs-on: ${{matrix.plat}}-latest
58+
runs-on: ubuntu-latest
59+
container:
60+
image: ruby:3.4
5961
strategy:
6062
fail-fast: false
6163
matrix:
62-
plat: ["ubuntu"]
6364
ref: ["7-2-stable", "8-0-stable", "main"]
6465
env:
6566
RAILSOPTS: --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
6667
steps:
6768
- uses: actions/checkout@v4
68-
- uses: ruby/setup-ruby@v1
69+
- uses: actions/setup-node@v4
6970
with:
70-
ruby-version: "3.3"
71-
bundler: latest
71+
node-version: 20
7272
- run: test/integration/user_upgrade_test.sh
7373
shell: bash

test/integration/user_upgrade_test.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ bundle remove actionmailer || true
1111
bundle remove rails || true
1212
bundle add rails --skip-install ${RAILSOPTS:-}
1313
bundle install --prefer-local
14+
npm uninstall tailwindcss
1415

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

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

5758
bundle install --prefer-local
5859
bundle show --paths | fgrep tailwind

0 commit comments

Comments
 (0)