Skip to content

Commit

Permalink
Merge pull request #1 from joprice/dirtyRepo
Browse files Browse the repository at this point in the history
add dirty repo check
  • Loading branch information
joprice authored Nov 15, 2018
2 parents e2a9761 + f0d5dd8 commit 41105a9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
15 changes: 13 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Check https://circleci.com/docs/2.0/language-javascript/ for more details

cache_key: &cache_key
dependencies-{{ arch }}-{{ checksum "package.json" }}-{{ checksum "esy.lock.json" }}
dependencies-v1-{{ arch }}-{{ checksum "package.json" }}-{{ checksum "esy.lock.json" }}

steps: &steps
- checkout
Expand All @@ -25,15 +25,26 @@ steps: &steps
keys:
- *cache_key

- run: npm install -g esy@latest
- run: npm install -g esy@0.3.4
- run: ls -l $(which esy)
- run: esy install
- run: esy build

- save_cache:
paths:
- ~/.esy
# - ~/.esy/3/i
# - ~/.esy/source-tarballs
key: *cache_key

- run:
name: Format
command: esy format

- run:
name: Check dirty workspace
command: git diff --no-ext-diff --quiet --exit-code

- run:
name: Run esy test
command: esy test
Expand Down
2 changes: 0 additions & 2 deletions executable/ReasonServerApp.re
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@

ReasonServer.Server.run();

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"test": "esy x TestReasonServer.exe",
"utop": "dune utop library -- -implicit-bindings",
"run": "esy x ReasonServerApp.exe",
"watch": "watchexec esy"
"watch": "watchexec esy",
"format": "bash -c 'refmt --in-place library/*.re executable/*.re'"
},
"dependencies": {
"@esy-ocaml/reason": "^3.3.7",
Expand Down

0 comments on commit 41105a9

Please sign in to comment.