Skip to content

Commit

Permalink
Merge pull request #7 from slamdata/ps-0.14
Browse files Browse the repository at this point in the history
Update for GH actions, PS 0.14
  • Loading branch information
garyb authored Jun 14, 2021
2 parents fe2f68d + 2fdd29c commit 2de4ff6
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 39 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: CI

on:
- push
- pull_request

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: purescript-contrib/setup-purescript@main

- uses: actions/setup-node@v1
with:
node-version: "12"

- name: Install dependencies
run: |
npm install -g bower
npm install
bower install --production
- name: Build source
run: npm run-script build

- name: Run tests
run: |
bower install
npm run-script test --if-present
11 changes: 4 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/.*
!/.gitignore
!/.github
/bower_components/
/node_modules/
/.pulp-cache/
/output/
/generated-docs/
/.psc-package/
/.psc*
/.purs*
/.psa*
/yarn.lock
package-lock.json
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# purescript-mote-runner

[![Latest release](http://img.shields.io/github/release/kRITZCREEK/purescript-mote-runner.svg)](https://github.com/kRITZCREEK/purescript-mote-runner/releases)
[![Build status](https://travis-ci.org/kRITZCREEK/purescript-mote-runner.svg?branch=master)](https://travis-ci.org/kRITZCREEK/purescript-mote-runner)
[![Latest release](http://img.shields.io/github/release/slamdata/purescript-mote-runner.svg)](https://github.com/slamdata/purescript-mote-runner/releases)
![Build Status](https://github.com/slamdata/purescript-mote-runner/actions/workflows/ci.yml/badge.svg)

Creates a CLI wrapper for test suites written with the `purescript-mote` DSL,
that allows to selectively run tests.
Expand Down
30 changes: 18 additions & 12 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
{
"name": "purescript-mote-runner",
"repository": {
"type": "git",
"url": "https://github.com/slamdata/purescript-mote-runner.git"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"node_modules",
"output",
"example"
"test",
"bower.json",
"package.json"
],
"dependencies": {
"purescript-prelude": "^4.0.0",
"purescript-console": "^4.1.0",
"purescript-optlicative": "^6.0.0",
"purescript-validation": "^4.0.0",
"purescript-node-process": "^7.0.0",
"purescript-record": "^2.0.0",
"purescript-mote": "^1.0.0"
"purescript-prelude": "^5.0.1",
"purescript-console": "^5.0.0",
"purescript-optlicative": "garyb/purescript-optlicative#6eb14679770828bc7df68daf54c814e3805e64fa",
"purescript-validation": "^5.0.0",
"purescript-node-process": "^8.2.0",
"purescript-record": "^3.0.0",
"purescript-mote": "^2.0.0"
},
"devDependencies": {
"purescript-psci-support": "^4.0.0",
"purescript-test-unit": "^15.0.0",
"purescript-node-fs-aff": "^6.0.0"
"purescript-psci-support": "^5.0.0",
"purescript-test-unit": "^16.0.0",
"purescript-node-fs-aff": "^7.0.0"
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"example:run": "node example/run.js"
},
"dependencies": {
"pulp": "^13.0.0",
"purescript": "^0.13.0",
"purescript-psa": "^0.7.3",
"rimraf": "^2.6.2"
"pulp": "^15.0.0",
"purescript": "^0.14.2",
"purescript-psa": "^0.8.2",
"rimraf": "^3.0.2"
}
}
4 changes: 2 additions & 2 deletions src/MoteRunner/Options.purs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Prelude
import Effect (Effect)
import Data.Either (Either(..))
import Data.Maybe (Maybe(..))
import Data.Validation.Semigroup (unV)
import Data.Validation.Semigroup (validation)
import Node.Optlicative (Optlicative, defaultPreferences, flag, optional, optlicate, renderErrors, string)

type Config =
Expand All @@ -16,7 +16,7 @@ type Config =
parseConfig Effect (Either String Config)
parseConfig = do
{ value } ← optlicate {} (defaultPreferences { globalOpts = parseConfig', errorOnUnrecognizedOpts = false })
pure $ unV (Left <<< renderErrors) Right value
pure $ validation (Left <<< renderErrors) Right value

parseConfig' :: Optlicative Config
parseConfig' = {pattern: _, list: _}
Expand Down

0 comments on commit 2de4ff6

Please sign in to comment.