Skip to content

Commit d9b1da2

Browse files
committed
fixed CI merge mistake
1 parent 9f0b1df commit d9b1da2

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

tests/dep-time-travel.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ npm install --no-save "eslint@${ESLINT_VERSION}" --ignore-scripts
1010

1111

1212

13-
if [[ -n "$TS_PARSER" ]]; then # if TS parser is manually set, always use it
13+
if [ "${ESLINT_VERSION}" = '^8.0.0-0' ]; then
14+
# workaround for eslint beta.
15+
echo "remove this branch when eslint v8 stable version is released."
16+
elif [[ -n "$TS_PARSER" ]]; then # if TS parser is manually set, always use it
1417
echo "Downgrading @typescript-eslint/parser..."
1518
npm i --no-save "@typescript-eslint/parser@${TS_PARSER}"
16-
elif [[ "$ESLINT_VERSION" =~ "^[0-9]+$" ]] ; then # workaround for eslint beta.
17-
if [[ "$ESLINT_VERSION" -lt "5" ]]; then # completely remove the new TypeScript parser for ESLint < v5
18-
echo "Removing @typescript-eslint/parser..."
19-
npm uninstall --no-save @typescript-eslint/parser
20-
elif [[ "$TRAVIS_NODE_VERSION" -lt "10" ]]; then # TS parser 3 requires node 10+
21-
npm i --no-save "@typescript-eslint/parser@3"
22-
fi
19+
elif [[ "$ESLINT_VERSION" -lt "5" ]]; then # completely remove the new TypeScript parser for ESLint < v5
20+
echo "Removing @typescript-eslint/parser..."
21+
npm uninstall --no-save @typescript-eslint/parser
22+
elif [[ "$TRAVIS_NODE_VERSION" -lt "10" ]]; then # TS parser 3 requires node 10+
23+
npm i --no-save "@typescript-eslint/parser@3"
2324
fi
2425

2526
# use these alternate TypeScript dependencies for ESLint < v4

0 commit comments

Comments
 (0)