8000 Don't include patch level in check names (#6889) · rfalmeida/activeadmin@9589416 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9589416

Browse files
deivid-rodriguezdeivid-rodriguez
authored
Don't include patch level in check names (activeadmin#6889)
1 parent f375a7b commit 9589416

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

‎.github/workflows/ci.yaml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
lint:
14-
name: lint (${{ matrix.ruby }})
14+
name: lint (${{ matrix.ruby.name }})
1515
runs-on: ${{ matrix.os }}
1616

1717
timeout-minutes: 15
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121

2222
matrix:
23-
ruby: [2.7.2]
23+
ruby: [{ name: 2.7, value: 2.7.2 }]
2424
os: [ubuntu-20.04]
2525

2626
steps:
@@ -36,7 +36,7 @@ jobs:
3636

3737
- uses: ruby/setup-ruby@v1
3838
with:
39-
ruby-version: ${{ matrix.ruby }}
39+
ruby-version: ${{ matrix.ruby.value }}
4040
bundler: none
4141

4242
- name: Install a specific rubygems version
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/cache@v2
5353
with:
5454
path: ${{ env.BUNDLE_PATH }}
55-
key: gems-${{ matrix.os }}-${{ matrix.ruby }}-rails_61-${{ hashFiles('current_gemfile.lock') }}
55+
key: gems-${{ matrix.os }}-${{ matrix.ruby.name }}-rails_61-${{ hashFiles('current_gemfile.lock') }}
5656

5757
- name: Install dependencies
5858
run: bundle install
@@ -83,7 +83,7 @@ jobs:
8383
path: coverage/raw.lint.json
8484

8585
test:
86-
name: test (${{ matrix.ruby }}, ${{ matrix.deps }})
86+
name: test (${{ matrix.ruby.name }}, ${{ matrix.deps }})
8787
runs-on: ${{ matrix.os }}
8888

8989
timeout-minutes: 15
@@ -92,21 +92,22 @@ jobs:
9292
fail-fast: false
9393

9494
matrix:
95-
ruby: [2.7.2, 2.6.6]
95+
ruby: [{ name: 2.7, value: 2.7.2 }, { name: 2.6, value: 2.6.6 }]
96+
9697
os: [ubuntu-20.04]
9798

9899
deps: [rails_52, rails_60, rails_61, rails_61_turbolinks, rails_61_webpacker]
99100

100101
include:
101-
- ruby: 2.5.8
102+
- ruby: { name: 2.5, value: 2.5.8 }
102103
os: ubuntu-20.04
103104
deps: rails_52
104105

105-
- ruby: 2.5.8
106+
- ruby: { name: 2.5, value: 2.5.8 }
106107
os: ubuntu-20.04
107108
deps: rails_60
108109

109-
- ruby: 2.5.8
110+
- ruby: { name: 2.5, value: 2.5.8 }
110111
os: ubuntu-20.04
111112
deps: rails_61
112113

@@ -130,7 +131,7 @@ jobs:
130131

131132
- uses: ruby/setup-ruby@v1
132133
with:
133-
ruby-version: ${{ matrix.ruby }}
134+
ruby-version: ${{ matrix.ruby.value }}
134135
bundler: none
135136

136137
- name: Install a specific rubygems version
@@ -146,7 +147,7 @@ jobs:
146147
uses: actions/cache@v2
147148
with:
148149
path: ${{ env.BUNDLE_PATH }}
149-
key: gems-${{ matrix.os }}-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('current_gemfile.lock') }}
150+
key: gems-${{ matrix.os }}-${{ matrix.ruby.value }}-${{ matrix.deps }}-${{ hashFiles('current_gemfile.lock') }}
150151

151152
- name: Install dependencies
152153
run: bundle install
@@ -163,7 +164,7 @@ jobs:
163164
uses: actions/cache@v2
164165
with:
165166
path: tmp/parallel_runtime_rspec.log
166-
key: runtimes-rspec-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_rspec.log') }}
167+
key: runtimes-rspec-${{ matrix.ruby.value }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_rspec.log') }}
167168

168169
- name: Run RSpec tests
169170
run: |
@@ -174,7 +175,7 @@ jobs:
174175
uses: actions/cache@v2
175176
with:
176177
path: tmp/parallel_runtime_cucumber.log
177-
key: runtimes-cucumber-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_cucumber.log') }}
178+
key: runtimes-cucumber-${{ matrix.ruby.value }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_cucumber.log') }}
178179

179180
- name: Run Cucumber features
180181
run: |
@@ -185,13 +186,13 @@ jobs:
185186
- name: Format coverage
186187
run: |
187188
bin/prepare_coverage
188-
mv coverage/.resultset.json coverage/raw.${{ matrix.ruby }}.${{ matrix.deps }}.json
189+
mv coverage/.resultset.json coverage/raw.${{ matrix.ruby.value }}.${{ matrix.deps }}.json
189190
190191
- name: Save partial coverage as an artifact
191192
uses: actions/upload-artifact@v2
192193
with:
193194
name: coverage
194-
path: coverage/raw.${{ matrix.ruby }}.${{ matrix.deps }}.json
195+
path: coverage/raw.${{ matrix.ruby.value }}.${{ matrix.deps }}.json
195196

196197
upload_coverage:
197198
runs-on: ubuntu-20.04

‎.github/workflows/daily.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
test:
11-
name: test (${{ matrix.ruby }}, ${{ matrix.deps }})
11+
name: test (${{ matrix.ruby.name }}, ${{ matrix.deps }})
1212
runs-on: ${{ matrix.os }}
1313

1414
timeout-minutes: 15
@@ -18,7 +18,7 @@ jobs:
1818

1919
matrix:
2020
os: [ubuntu-20.04]
21-
ruby: [jruby-9.2.16.0]
21+
ruby: [{ name: jruby-9.2, value: jruby-9.2.16.0 }]
2222
deps: ["rails_52", "rails_60"]
2323

2424
env:
@@ -41,7 +41,7 @@ jobs:
4141

4242
- uses: ruby/setup-ruby@v1
4343
with:
44-
ruby-version: ${{ matrix.ruby }}
44+
ruby-version: ${{ matrix.ruby.value }}
4545
bundler: none
4646

4747
- name: Install a specific rubygems version
@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/cache@v2
5858
with:
5959
path: ${{ env.BUNDLE_PATH }}
60-
key: gems-${{ matrix.os }}-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('current_gemfile.lock') }}
60+
key: gems-${{ matrix.os }}-${{ matrix.ruby.value }}-${{ matrix.deps }}-${{ hashFiles('current_gemfile.lock') }}
6161

6262
- name: Install dependencies
6363
run: bundle install
@@ -74,7 +74,7 @@ jobs:
7474
uses: actions/cache@v2
7575
with:
7676
path: tmp/parallel_runtime_rspec.log
77-
key: runtimes-rspec-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_rspec.log') }}
77+
key: runtimes-rspec-${{ matrix.ruby.value }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_rspec.log') }}
7878

7979
- name: Run RSpec tests
8080
run: |
@@ -85,7 +85,7 @@ jobs:
8585
uses: actions/cache@v2
8686
with:
8787
path: tmp/parallel_runtime_cucumber.log
88-
key: runtimes-cucumber-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_cucumber.log') }}
88+
key: runtimes-cucumber-${{ matrix.ruby.value }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_cucumber.log') }}
8989

9090
- name: Run Cucumber features
9191
run: |

0 commit comments

Comments
 (0)
0