Skip to content

Commit aa3e322

Browse files
author
Winter Dong
committed
Merge branch 'staging' into drone-s3-cache
2 parents fd67e25 + 91028c1 commit aa3e322

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.drone.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ steps:
2323
echo "Pull request is from fork $head_repo; exiting."
2424
exit 1
2525
fi
26+
2627
- name: restore-cache
2728
image: plugins/s3-cache
2829
settings:
@@ -33,6 +34,7 @@ steps:
3334
from_secret: S3_CACHE_ACCESS_KEY
3435
secret_key:
3536
from_secret: S3_CACHE_SECRET_KEY
37+
3638
- name: unit-tests
3739
image: wintercdo/code-dot-org:0.7
3840
volumes:
@@ -54,6 +56,7 @@ steps:
5456
- cp -rn "$(pwd)/home/circleci/.rbenv/versions/2.5.0/lib/ruby/gems/2.5.0" /home/circleci/.rbenv/versions/2.5.0/lib/ruby/gems || true
5557
- cp -rn "$(pwd)/home/circleci/.cache" /home/circleci || true
5658
- /entrypoint.sh docker/unit_tests.sh
59+
5760
- name: update-cache
5861
image: plugins/s3-cache
5962
volumes:
@@ -89,7 +92,6 @@ trigger:
8992
event:
9093
include:
9194
- pull_request
92-
- push
9395

9496
# ---
9597
# kind: pipeline

docker/unit_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ localize_apps: true
5151
dashboard_enable_pegasus: true
5252
dashboard_workers: 5
5353
skip_seed_all: true
54+
google_maps_api_key: boguskey
5455
" >> locals.yml
5556
echo "Wrote secrets from env vars into locals.yml."
5657
set -x

0 commit comments

Comments
 (0)