File tree 3 files changed +18
-11
lines changed
3 files changed +18
-11
lines changed Original file line number Diff line number Diff line change 40
40
runs-on : ${{matrix.plat}}-latest
41
41
steps :
42
42
- uses : actions/checkout@v4
43
+ - uses : actions/setup-node@v4
44
+ with :
45
+ node-version : 20
43
46
- uses : ruby/setup-ruby@v1
44
47
with :
45
48
ruby-version : " 3.4"
55
58
runs-on : ${{matrix.plat}}-latest
56
59
steps :
57
60
- uses : actions/checkout@v4
61
+ - uses : actions/setup-node@v4
62
+ with :
63
+ node-version : 20
58
64
- uses : ruby/setup-ruby@v1
59
65
with :
60
66
ruby-version : " 3.4"
Original file line number Diff line number Diff line change @@ -36,38 +36,38 @@ jobs:
36
36
37
37
user-install :
38
38
name : " user-install (rails ${{ matrix.ref }})"
39
- runs-on : ${{matrix.plat}}-latest
39
+ runs-on : ubuntu-latest
40
+ container :
41
+ image : ruby:3.4
40
42
strategy :
41
43
fail-fast : false
42
44
matrix :
43
- plat : ["ubuntu"]
44
45
ref : ["7-2-stable", "8-0-stable", "main"]
45
46
env :
46
47
RAILSOPTS : --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
47
48
steps :
48
49
- uses : actions/checkout@v4
49
- - uses : ruby /setup-ruby@v1
50
+ - uses : actions /setup-node@v4
50
51
with :
51
- ruby-version : " 3.3"
52
- bundler : latest
52
+ node-version : 20
53
53
- run : test/integration/user_install_test.sh
54
54
shell : bash
55
55
56
56
user-upgrade :
57
57
name : " user-upgrade (rails ${{ matrix.ref }})"
58
- runs-on : ${{matrix.plat}}-latest
58
+ runs-on : ubuntu-latest
59
+ container :
60
+ image : ruby:3.4
59
61
strategy :
60
62
fail-fast : false
61
63
matrix :
62
- plat : ["ubuntu"]
63
64
ref : ["7-2-stable", "8-0-stable", "main"]
64
65
env :
65
66
RAILSOPTS : --git=https://github.com/rails/rails --ref=${{ matrix.ref }}
66
67
steps :
67
68
- uses : actions/checkout@v4
68
- - uses : ruby /setup-ruby@v1
69
+ - uses : actions /setup-node@v4
69
70
with :
70
- ruby-version : " 3.3"
71
- bundler : latest
71
+ node-version : 20
72
72
- run : test/integration/user_upgrade_test.sh
73
73
shell : bash
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ bundle remove actionmailer || true
11
11
bundle remove rails || true
12
12
bundle add rails --skip-install ${RAILSOPTS:- }
13
13
bundle install --prefer-local
14
+ npm uninstall tailwindcss
14
15
15
16
# do our work a directory with spaces in the name (#176, #184)
16
17
rm -rf " My Workspace"
@@ -52,7 +53,7 @@ bundle remove tailwindcss-rails --skip-install
52
53
bundle remove tailwindcss-ruby --skip-install
53
54
54
55
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 }
56
57
57
58
bundle install --prefer-local
58
59
bundle show --paths | fgrep tailwind
You can’t perform that action at this time.
0 commit comments