From ae864647c1fb79412dba60c696afc0d8f5908053 Mon Sep 17 00:00:00 2001 From: Neil Kistner Date: Wed, 24 Apr 2019 20:41:42 -0500 Subject: [PATCH] Meta file updates - Switch from Travis to CircleCI - Switch from Surge to Now --- .circleci/config.yml | 36 ++++++++++++++++++++++++++++++++++++ .gitattributes | 1 + .travis.yml | 12 ------------ license | 20 ++++---------------- now.json | 5 +++++ package.json | 1 + readme.md | 26 +++++++------------------- 7 files changed, 54 insertions(+), 47 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 .travis.yml create mode 100644 now.json diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..95b6d69 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,36 @@ +version: 2 +jobs: + build: + docker: + - image: circleci/node:10 + steps: + - checkout + + - restore_cache: + name: Restore node_modules cache + keys: + - v1-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }} + - v1-node-{{ arch }}-{{ .Branch }}- + - v1-node-{{ arch }}- + + - run: + name: Nodejs Version + command: node --version + + - run: + name: Yarn Version + command: yarn --version + + - run: + name: Install Packages + command: yarn install --frozen-lockfile + + - run: + name: Run Tests + command: yarn test --maxWorkers=2 + + - save_cache: + name: Save node_modules cache + key: v1-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }} + paths: + - node_modules diff --git a/.gitattributes b/.gitattributes index 391f0a4..905189b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ * text=auto *.js text eol=lf +*.re linguist-language=OCaml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7b03fc3..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -sudo: false - -language: node_js - -node_js: - - 9 - - 8 - - 6 - -cache: - directories: - - $HOME/.cache diff --git a/license b/license index 62dcfc3..4ee49f4 100644 --- a/license +++ b/license @@ -1,21 +1,9 @@ -The MIT License (MIT) +MIT License Copyright (c) Neil Kistner (neilkistner.com) -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/now.json b/now.json new file mode 100644 index 0000000..4cb2676 --- /dev/null +++ b/now.json @@ -0,0 +1,5 @@ +{ + "alias": "reason-calculator", + "builds": [{ "src": "package.json", "use": "@now/static-build" }], + "version": 2 +} diff --git a/package.json b/package.json index 57db688..6061b65 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "clean:bsb": "bsb -clean-world", "clean:parcel": "rimraf dist lib .merlin", "pretest": "bsb -make-world", + "now-build": "yarn build", "start": "run-p start:*", "start:bsb": "bsb -make-world -w", "start:parcel": "parcel public/index.html", diff --git a/readme.md b/readme.md index 514dbfa..e70db15 100644 --- a/readme.md +++ b/readme.md @@ -1,15 +1,10 @@ -# reason-calculator +# reason-calculator · [![Website][website-image]][website-url] [![Build Status][circleci-image]][circleci-url] -[![Website][website-image]][website-url] -[![Build Status][travis-image]][travis-url] -[![dependencies][deps-image]][deps-url] -[![devDependencies][depsdev-image]][depsdev-url] - -> A calculator built with [Reason](https://github.com/facebook/reason) and [reason-react](https://github.com/reasonml/reason-react). +> A calculator built with [Reason](//github.com/facebook/reason) and [reason-react](//github.com/reasonml/reason-react). ## Live Demo -https://reason-calculator.surge.sh +https://reason-calculator.now.sh ## Setup @@ -45,15 +40,8 @@ $ npm run build MIT © [Neil Kistner](https://neilkistner.com) -[website-image]: https://img.shields.io/website-up-down-green-red/https/reason-calculator.surge.sh.svg?style=flat-square -[website-url]: https://reason-calculator.surge.sh - -[travis-image]: https://img.shields.io/travis/wyze/reason-calculator.svg?style=flat-square -[travis-url]: https://travis-ci.org/wyze/reason-calculator - - -[deps-image]: https://img.shields.io/david/wyze/reason-calculator.svg?style=flat-square -[deps-url]: https://david-dm.org/wyze/reason-calculator +[circleci-image]: https://img.shields.io/circleci/project/github/wyze/reason-calculator.svg?style=flat-square +[circleci-url]: https://circleci.com/gh/wyze/reason-calculator -[depsdev-image]: https://img.shields.io/david/dev/wyze/reason-calculator.svg?style=flat-square -[depsdev-url]: https://david-dm.org/wyze/reason-calculator?type=dev +[website-image]: https://img.shields.io/website-up-down-green-red/https/reason-calculator.now.sh.svg?style=flat-square +[website-url]: https://reason-calculator.now.sh