Skip to content

Commit 3d6dc0a

Browse files
authored
Merge pull request #72 from flavorjones/flavorjones-ci-unify-workflows
ci: unify main and packaging workflows into ci.yml
2 parents 9d2a96d + 6e405d9 commit 3d6dc0a

File tree

3 files changed

+26
-42
lines changed

3 files changed

+26
-42
lines changed

.github/workflows/gem-install.yml renamed to .github/workflows/ci.yml

+23-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: packaging
1+
name: ci
22
concurrency:
33
group: "${{github.workflow}}-${{github.ref}}"
44
cancel-in-progress: true
@@ -7,7 +7,7 @@ on:
77
push:
88
branches:
99
- main
10-
- v4.x
10+
- v4*
1111
tags:
1212
- v*.*.*
1313
pull_request:
@@ -16,7 +16,25 @@ on:
1616
- '*'
1717

1818
jobs:
19+
test:
20+
runs-on: ubuntu-latest
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
ruby: ["3.0", "3.1", "3.2", "3.3", "3.4", "head"]
25+
steps:
26+
- uses: actions/checkout@v4
27+
- run: rm Gemfile.lock
28+
- uses: ruby/setup-ruby@v1
29+
with:
30+
ruby-version: ${{matrix.ruby}}
31+
bundler: latest
32+
bundler-cache: true
33+
- name: Run tests
34+
run: bundle exec rake test
35+
1936
package:
37+
needs: [ "test" ]
2038
name: "package (${{ matrix.platform }})"
2139
strategy:
2240
fail-fast: false
@@ -47,9 +65,9 @@ jobs:
4765
path: pkg
4866
retention-days: 1
4967

50-
vanilla-install:
68+
install-ruby:
5169
name: "install (ruby)"
52-
needs: ["package"]
70+
needs: [ "package" ]
5371
runs-on: ubuntu-latest
5472
steps:
5573
- uses: ruby/setup-ruby@v1
@@ -62,7 +80,7 @@ jobs:
6280
- run: "gem install pkg/tailwindcss-ruby-*.gem"
6381
- run: "tailwindcss 2>&1 | fgrep 'ERROR: Cannot find the tailwindcss executable'"
6482

65-
install-matrix:
83+
install-native:
6684
name: "install (${{ matrix.platform }})"
6785
needs: [ "package" ]
6886
strategy:

.github/workflows/downstream.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
- url: https://github.com/rails/tailwindcss-rails
2828
name: rails-unit
2929
command: "bin/test"
30-
ruby: "3.3"
30+
ruby: "3.4"
3131
- url: https://github.com/rails/tailwindcss-rails
3232
name: rails-install
3333
command: "env TAILWINDCSSOPTS=--path=../../.. test/integration/user_install_test.sh"
34-
ruby: "3.3"
34+
ruby: "3.4"
3535
- url: https://github.com/rails/tailwindcss-rails
3636
name: rails-upgrade
3737
command: "env TAILWINDCSSOPTS=--path=../../.. test/integration/user_upgrade_test.sh"
38-
ruby: "3.3"
38+
ruby: "3.4"
3939
runs-on: ubuntu-latest
4040
steps:
4141
- uses: actions/checkout@v4

.github/workflows/main.yml

-34
This file was deleted.

0 commit comments

Comments
 (0)