Skip to content

Commit

Permalink
Update Yarn to the latest version (closes date-fns#883) (date-fns#1191)
Browse files Browse the repository at this point in the history
* Update Yarn to the latest version
* Fix find warning
* Fix yarn warning about passing args with --
  • Loading branch information
kossnocorp committed Jun 7, 2019
1 parent 6872aba commit 8b8952a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm install -g yarn

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"scripts": {
"test": "karma start config/karma.js",
"lint": "echo \"Due to ongoing migration to Prettier, the linter is disabled.\"",
"benchmark": "env TEST_BENCHMARK=true yarn test -- --single-run",
"benchmark": "env TEST_BENCHMARK=true yarn test --single-run",
"stats": "cloc . --exclude-dir=node_modules,tmp,.git",
"postinstall": "node ./docs/printV2Notice.js"
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ babel src --source-root src --out-dir "$dir" --ignore test.js,benchmark.js --cop
# Copy ES (a.k.a. ES6, ES2016, ES2017, etc.) files

# Copy the source code
for fnDir in $(find src -type d -maxdepth 1 -mindepth 1 | sed 's/src\///' | sed 's/\///')
for fnDir in $(find src -maxdepth 1 -mindepth 1 -type d | sed 's/src\///' | sed 's/\///')
do
if [ "$fnDir" == "esm" ]
then
Expand Down
4 changes: 2 additions & 2 deletions scripts/test/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ then
./scripts/test/systemJS.js
./scripts/test/smoke.sh

yarn test -- --single-run
yarn test --single-run

./scripts/test/dst.sh

Expand All @@ -34,7 +34,7 @@ then
elif [ "$TEST_SUITE" == "cross_browser" ] && [ "$SAUCE_USERNAME" != "" ]
then
yarn test-cross-browser
env TEST_CROSS_BROWSER=true yarn test -- --single-run
env TEST_CROSS_BROWSER=true yarn test --single-run

else
printf "\n\033[0;31m" "UNKNOWN SUITE!" "\033[0m\n"
Expand Down
2 changes: 1 addition & 1 deletion scripts/test/tz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ for tz in UTC-12:00 UTC-11:00 UTC-10:00 UTC-09:30 UTC-09:00 \
UTC+11:30 UTC+12:00 UTC+12:45 UTC+13:00 UTC+14:00
do
printf "Run test in time zone $tz\n"
env TEST_TZ=true USE_STATIC_TESTS=true TZ=$tz yarn test -- --single-run \
env TEST_TZ=true USE_STATIC_TESTS=true TZ=$tz yarn test --single-run \
&>tmp/last_test_output.txt || (cat tmp/last_test_output.txt && exit 1) || exit 1
done
2 changes: 1 addition & 1 deletion scripts/test/tzExtended.sh
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,6 @@ fi
for tz in "${tz_array[@]}"
do
printf "Run test in time zone $tz\n"
env TEST_TZ=true USE_STATIC_TESTS=true TZ=$tz yarn test -- --single-run \
env TEST_TZ=true USE_STATIC_TESTS=true TZ=$tz yarn test --single-run \
&>tmp/last_test_output.txt || (cat tmp/last_test_output.txt && exit 1) || exit 1
done

0 comments on commit 8b8952a

Please sign in to comment.