Skip to content

Commit

Permalink
Meta file updates
Browse files Browse the repository at this point in the history
- Switch from Travis to CircleCI
- Switch from Surge to Now
  • Loading branch information
wyze committed Apr 25, 2019
1 parent 18da5d2 commit ae86464
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 47 deletions.
36 changes: 36 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
* text=auto
*.js text eol=lf
*.re linguist-language=OCaml
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

20 changes: 4 additions & 16 deletions license
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
The MIT License (MIT)
MIT License

Copyright (c) Neil Kistner <[email protected]> (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.
5 changes: 5 additions & 0 deletions now.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"alias": "reason-calculator",
"builds": [{ "src": "package.json", "use": "@now/static-build" }],
"version": 2
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
26 changes: 7 additions & 19 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
# reason-calculator
# reason-calculator &middot; [![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

Expand Down Expand Up @@ -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

1 comment on commit ae86464

@vercel
Copy link

@vercel vercel bot commented on ae86464 Apr 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.