Merge pull request #1513 from NateRadebaugh/circleci

Circleci
NateRadebaugh · Nov 19, 2020 · b00b967 · b00b967 · vercel · Nov 19, 2020
2 parents 2febd6a + aafcd30
commit b00b967
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 51 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [12, 10]
+        node: [14, 12, 10]
     steps:
       - uses: actions/setup-node@v1
         with:
@@ -36,7 +36,7 @@ jobs:
           fetch-depth: 1
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
           registry-url: https://registry.npmjs.org/
       - run: npm i -g yarn
       - run: yarn --frozen-lockfile

diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ os:
 node_js:
   - "10"
   - "12"
+  - "14"
   - stable
 script:
   - yarn lint

diff --git a/README.md b/README.md
@@ -6,7 +6,6 @@
 
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
-[![CircleCI](https://circleci.com/gh/NateRadebaugh/react-datetime.svg?style=svg)](https://circleci.com/gh/NateRadebaugh/react-datetime)
 [![Build Status](https://secure.travis-ci.org/NateRadebaugh/react-datetime.svg)](https://travis-ci.org/NateRadebaugh/react-datetime)
 [![npm version](https://badge.fury.io/js/%40nateradebaugh%2Freact-datetime.svg)](https://badge.fury.io/js/%40nateradebaugh%2Freact-datetime)
 

diff --git a/package.json b/package.json
@@ -70,7 +70,6 @@
     "test:coverage": "yarn test --coverage",
     "test:all": "echo 'Running tests...' && yarn bundlesize && yarn test:coverage && echo 'All tests passed! 🤘'",
     "test:watch": "cross-env TZ=Europe/Stockholm tsdx test --watch",
-    "circleci-test": "cross-env CI=1 TZ=Europe/Stockholm JEST_JUNIT_OUTPUT_DIR=reports/junit tsdx test --ci --reporters=default --reporters=jest-junit --runInBand",
     "lint": "yarn eslint src --ext .js,.ts,.jsx,.tsx",
     "lint:fix": "yarn lint --fix",
     "prettier": "prettier --write {src,scss}/*.{json,js,jsx,ts,tsx,scss} *.{json,js,md,mdx}",
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ os: @@
     node_js:
       - "10"
       - "12"
+      - "14"
       - stable
     script:
       - yarn lint
@@ Expand Down @@