10000 Move test-report persistance to separate task · activeadmin/activeadmin@a0bb67f · GitHub
[go: up one dir, main page]

Skip to content

Commit a0bb67f

Browse files
Move test-report persistance to separate task
Otherwise we will accidentally restore coverage files created by the test app creation jobs, and that will cause conflicts.
1 parent 4d77cee commit a0bb67f

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

.circleci/config.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,18 @@ version: 2.1
4848
name: Create test app
4949
command: COVERAGE=true PARALLEL_TEST_PROCESSORS=4 bin/rake setup
5050

51+
.restore_test_reporter: &restore_test_reporter
52+
attach_workspace:
53+
at: bin
54+
5155
.restore_coverage: &restore_coverage
5256
attach_workspace:
5357
at: coverage
5458

5559
.format_coverage: &format_coverage
5660
run:
5761
name: Format coverage
58-
command: coverage/test-reporter format-coverage --input-type simplecov --output coverage/codeclimate.$CIRCLE_JOB.json
62+
command: bin/test-reporter format-coverage --input-type simplecov --output coverage/codeclimate.$CIRCLE_JOB.json
5963

6064
.save_coverage: &save_coverage
6165
persist_to_workspace:
@@ -68,8 +72,8 @@ version: 2.1
6872
name: Upload coverage results to Code Climate
6973
command: |
7074
# The parts number should match the number of jobs under upload_coverage/requires
71-
coverage/test-reporter sum-coverage coverage/codeclimate.*.json --parts 20 --output coverage/codeclimate.total.json
72-
coverage/test-reporter upload-coverage --input coverage/codeclimate.total.json
75+
bin/test-reporter sum-coverage coverage/codeclimate.*.json --parts 20 --output coverage/codeclimate.total.json
76+
bin/test-reporter upload-coverage --input coverage/codeclimate.total.json
7377
7478
.save_test_app: &save_test_app
7579
persist_to_workspace:
@@ -137,7 +141,7 @@ version: 2.1
137141
- *save_cache
138142
- *restore_test_app_from_workspace
139143
- *restore_test_times
140-
- *restore_coverage
144+
- *restore_test_reporter
141145
- *run_tests
142146
- *run_features
143147
- *format_coverage
@@ -151,7 +155,7 @@ version: 2.1
151155
- *copy_current_gemfile
152156
- *restore_cache
153157
- *install_dependencies
154-
- *restore_coverage
158+
- *restore_test_reporter
155159
- *save_cache
156160
- *create_test_app
157161
- *format_coverage
@@ -167,12 +171,12 @@ jobs:
167171
- run:
168172
name: Download Code Climate test-reporter
169173
command: |
170-
mkdir coverage
171-
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-0.6.3-linux-amd64 > coverage/test-reporter
172-
chmod +x coverage/test-reporter
174+
mkdir bin
175+
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-0.6.3-linux-amd64 > bin/test-reporter
176+
chmod +x bin/test-reporter
173177
174178
- persist_to_workspace:
175-
root: coverage
179+
root: bin
176180
paths:
177181
- test-reporter
178182

@@ -183,6 +187,7 @@ jobs:
183187
CC_TEST_REPORTER_ID: 8d5fcf7abea6d56c625104a9d1a81140a588a7f546f4fa9de9bc6ffc8feaaf70
184188

185189
steps:
190+
- *restore_test_reporter
186191
- *restore_coverage
187192
- *submit_coverage
188193

@@ -247,7 +252,7 @@ jobs:
247252
- *install_dependencies
248253
- *save_cache
249254
- *generate_docs
250-
- *restore_coverage
255+
- *restore_test_reporter
251256
- *run_lints
252257
- *run_bug_report_template
253258
- *format_coverage

0 commit comments

Comments
 (0)
0