Skip to content

Commit 93e0e59

Browse files
committed
use CircleCI environment TZ to set timezone
1 parent 5c00c81 commit 93e0e59

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

.circleci/config.yml

+12
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ jobs:
3535
docker:
3636
# need '-browsers' version to test in real (xvfb-wrapped) browsers
3737
- image: circleci/node:12.22.1-browsers
38+
environment:
39+
# Alaska time (arbitrary timezone to test date logic)
40+
TZ: "America/Anchorage"
3841
parallelism: 8
3942
working_directory: ~/plotly.js
4043
steps:
@@ -48,6 +51,9 @@ jobs:
4851
docker:
4952
# need '-browsers' version to test in real (xvfb-wrapped) browsers
5053
- image: circleci/node:12.22.1-browsers
54+
environment:
55+
# Alaska time (arbitrary timezone to test date logic)
56+
TZ: "America/Anchorage"
5157
parallelism: 8
5258
working_directory: ~/plotly.js
5359
steps:
@@ -61,6 +67,9 @@ jobs:
6167
docker:
6268
# need '-browsers' version to test in real (xvfb-wrapped) browsers
6369
- image: circleci/node:12.22.1-browsers
70+
environment:
71+
# Alaska time (arbitrary timezone to test date logic)
72+
TZ: "America/Anchorage"
6473
working_directory: ~/plotly.js
6574
steps:
6675
- attach_workspace:
@@ -73,6 +82,9 @@ jobs:
7382
docker:
7483
# need '-browsers' version to test in real (xvfb-wrapped) browsers
7584
- image: circleci/node:12.22.1-browsers
85+
environment:
86+
# Alaska time (arbitrary timezone to test date logic)
87+
TZ: "America/Anchorage"
7688
working_directory: ~/plotly.js
7789
steps:
7890
- attach_workspace:

.circleci/test.sh

-21
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,9 @@ retry () {
3333
fi
3434
}
3535

36-
set_timezone () {
37-
# Alaska time (arbitrary timezone to test date logic)
38-
TZ="America/Anchorage"
39-
40-
echo "set timezone to $TZ"
41-
sudo cp /usr/share/zoneinfo/$TZ /etc/localtime
42-
43-
echo "display date in timezone"
44-
date
45-
46-
export TZ
47-
}
48-
4936
case $1 in
5037

5138
no-gl-jasmine)
52-
set_timezone
53-
5439
SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
5540
MAX_AUTO_RETRY=2
5641
retry npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
@@ -59,8 +44,6 @@ case $1 in
5944
;;
6045

6146
webgl-jasmine)
62-
set_timezone
63-
6447
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
6548
for s in ${SHARDS[@]}; do
6649
MAX_AUTO_RETRY=2
@@ -71,8 +54,6 @@ case $1 in
7154
;;
7255

7356
flaky-no-gl-jasmine)
74-
set_timezone
75-
7657
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
7758

7859
for s in ${SHARDS[@]}; do
@@ -84,8 +65,6 @@ case $1 in
8465
;;
8566

8667
bundle-jasmine)
87-
set_timezone
88-
8968
npm run test-bundle || EXIT_STATE=$?
9069
exit $EXIT_STATE
9170
;;

0 commit comments

Comments
 (0)