Skip to content

Commit 3a616ca

Browse files
author
Frank Natividad
committed
Updating circle.yml to use updated run-all.sh
1 parent 3cd112e commit 3a616ca

File tree

2 files changed

+15
-45
lines changed

2 files changed

+15
-45
lines changed

circle.yml

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,16 @@ machine:
1010
# Timezone
1111
timezone: America/Los_Angeles
1212

13-
# Dependencies
13+
# Dependencies needed by run-all.sh
1414
dependencies:
1515
override:
16-
# Ruby 2.3.1
17-
- cd logging && rvm-exec 2.3.1 bundle install && cd ..
18-
- cd bigquery && rvm-exec 2.3.1 bundle install && cd ..
19-
- cd datastore && rvm-exec 2.3.1 bundle install && cd ..
20-
- cd language && rvm-exec 2.3.1 bundle install && cd ..
21-
- cd pubsub && rvm-exec 2.3.1 bundle install && cd ..
22-
- cd speech && rvm-exec 2.3.1 bundle install && cd ..
23-
- cd storage && rvm-exec 2.3.1 bundle install && cd ..
24-
- cd translate && rvm-exec 2.3.1 bundle install && cd ..
25-
- cd vision && rvm-exec 2.3.1 bundle install && cd ..
26-
# Ruby 2.2.5
27-
- cd logging && rvm-exec 2.2.5 bundle install && cd ..
28-
- cd bigquery && rvm-exec 2.2.5 bundle install && cd ..
29-
- cd datastore && rvm-exec 2.2.5 bundle install && cd ..
30-
- cd language && rvm-exec 2.2.5 bundle install && cd ..
31-
- cd pubsub && rvm-exec 2.2.5 bundle install && cd ..
32-
- cd speech && rvm-exec 2.2.5 bundle install && cd ..
33-
- cd storage && rvm-exec 2.2.5 bundle install && cd ..
34-
- cd translate && rvm-exec 2.2.5 bundle install && cd ..
35-
- cd vision && rvm-exec 2.2.5 bundle install && cd ..
16+
- sudo apt-get update; sudo apt-get install realpath
3617

3718
# Test
3819
test:
3920
override:
40-
# Ruby 2.3.1
41-
- cd logging && rvm-exec 2.3.1 bundle exec rspec && cd ..
42-
- cd bigquery && rvm-exec 2.3.1 bundle exec rspec && cd ..
43-
- cd datastore && rvm-exec 2.3.1 bundle exec rspec && cd ..
44-
- cd language && rvm-exec 2.3.1 bundle exec rspec && cd ..
45-
- cd pubsub && rvm-exec 2.3.1 bundle exec rspec && cd ..
46-
- cd speech && rvm-exec 2.3.1 bundle exec rspec && cd ..
47-
- cd storage && rvm-exec 2.3.1 bundle exec rspec && cd ..
48-
- cd translate && rvm-exec 2.3.1 bundle exec rspec && cd ..
49-
- cd vision && rvm-exec 2.3.1 bundle exec rspec && cd ..
5021
# Ruby 2.2.5
51-
- cd logging && rvm-exec 2.2.5 bundle exec rspec && cd ..
52-
- cd bigquery && rvm-exec 2.2.5 bundle exec rspec && cd ..
53-
- cd datastore && rvm-exec 2.2.5 bundle exec rspec && cd ..
54-
- cd language && rvm-exec 2.2.5 bundle exec rspec && cd ..
55-
- cd pubsub && rvm-exec 2.2.5 bundle exec rspec && cd ..
56-
- cd speech && rvm-exec 2.2.5 bundle exec rspec && cd ..
57-
- cd storage && rvm-exec 2.2.5 bundle exec rspec && cd ..
58-
- cd translate && rvm-exec 2.2.5 bundle exec rspec && cd ..
59-
- cd vision && rvm-exec 2.2.5 bundle exec rspec && cd ..
22+
- rvm-exec 2.2.5 ./spec/run-all.sh
23+
# Ruby 2.3.1
24+
- rvm-exec 2.3.1 ./spec/run-all.sh
6025

spec/run-all.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#! /bin/bash
2-
3-
set -e
1+
#!/bin/bash
42

53
for required_variable in \
64
GOOGLE_CLOUD_PROJECT \
@@ -25,6 +23,7 @@ export TRANSLATE_KEY="$TRANSLATE_API_KEY"
2523

2624
script_directory="$(dirname "`realpath $0`")"
2725
repo_directory="$(dirname $script_directory)"
26+
status_return=0 # everything passed
2827

2928
for product in \
3029
bigquery \
@@ -39,6 +38,12 @@ for product in \
3938
; do
4039
echo "[$product]"
4140
cd "$repo_directory/$product/"
42-
bundle install
43-
bundle exec rspec --format documentation --fail-fast
41+
bundle install && bundle exec rspec --format documentation
42+
43+
# Check status of bundle exec rspec
44+
if [ $? != 0 ]; then
45+
status_return=1
46+
fi
4447
done
48+
49+
exit $status_return

0 commit comments

Comments
 (0)