Skip to content

Commit 397673f

Browse files
authored
Merge pull request #9619 from ehuelsmann/testing/reliable-circleci
More efficient starman and restored artifact handling
2 parents 818e8df + f0ea292 commit 397673f

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

.circleci/config.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
version: 2.1
23

34
# Define defaults
@@ -9,6 +10,7 @@ _defaults: &defaults
910
aliases:
1011
- &store_artifacts
1112
store_artifacts:
13+
when: always
1214
path: /tmp/artifact/
1315

1416
# UI Coverage orbs
@@ -66,7 +68,7 @@ commands:
6668
then
6769
make devtest TESTS="--no-progress --job-count $JOB_COUNT \"--cover=$DEVEL_COVER_OPTIONS\" xt/*.t"
6870
else
69-
make devtest TESTS="--no-progress --job-count 2 xt/*.t"
71+
make devtest TESTS="--no-progress --job-count 6 xt/*.t"
7072
fi
7173
7274
- run:
@@ -169,6 +171,8 @@ commands:
169171
- coveralls/upload:
170172
parallel_finished: true
171173

174+
- *store_artifacts
175+
172176
dev-prove-pg:
173177
steps:
174178
- run:
@@ -194,7 +198,7 @@ commands:
194198
then
195199
make devtest TESTS="--no-progress --job-count $JOB_COUNT \"--cover=$DEVEL_COVER_OPTIONS\" xt/*.pg"
196200
else
197-
make devtest TESTS="--no-progress --job-count 2 xt/*.pg"
201+
make devtest TESTS="--no-progress --job-count 6 xt/*.pg"
198202
fi
199203
200204
- run:
@@ -257,7 +261,7 @@ commands:
257261
then
258262
make devtest TESTS="--no-progress --job-count $JOB_COUNT \"--cover=$DEVEL_COVER_OPTIONS\" t/"
259263
else
260-
make devtest TESTS='--no-progress --job-count 2 t/'
264+
make devtest TESTS='--no-progress --job-count 6 t/'
261265
fi
262266
263267
- run:
@@ -335,7 +339,9 @@ commands:
335339
- run:
336340
name: Set up dirs and files
337341
command: |
338-
mkdir -p logs/screens
342+
# make sure the logs are uploaded as artifacts
343+
ln -s /tmp/artifact logs
344+
mkdir -p /tmp/artifact/screens
339345
# these commands are in start.sh of the Perl container too:
340346
341347
# Freshen up CPAN
@@ -406,8 +412,8 @@ commands:
406412
if [ "x$COVERAGE" == "x1" ]
407413
then
408414
JOB_COUNT=2
415+
export PERL5OPT="$PERL5OPT -MDevel::Cover=$DEVEL_COVER_OPTIONS"
409416
fi
410-
PERL5OPT="$PERL5OPT -MDevel::Cover=$DEVEL_COVER_OPTIONS" \
411417
starman --preload-app -E test --pid starman.pid --workers $JOB_COUNT \
412418
--max-requests 5000 --error-log logs/starman-error.log \
413419
-Ilib -Iold/lib -Ixt/lib --port 5762 bin/ledgersmb-server.psgi

0 commit comments

Comments
 (0)