From d439f7c4efd1949fb86e160c6c50987bb79de0c0 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 8 Dec 2020 06:42:53 -0800 Subject: [PATCH 1/5] Run CI on pull requests, too --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49aff92..65223ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: CI -on: push +on: [push, pull_request] jobs: build: From 838f03dc6636b97e924027baa34dbafb4b967beb Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 8 Dec 2020 06:47:02 -0800 Subject: [PATCH 2/5] Update to v0.14.0-rc3 and migrate to Spago --- .github/workflows/ci.yml | 13 +++++-------- package.json | 8 ++------ packages.dhall | 4 ++++ spago.dhall | 10 ++++++++++ 4 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 packages.dhall create mode 100644 spago.dhall diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65223ee..5470cec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,21 +9,18 @@ jobs: - uses: actions/checkout@v2 - uses: purescript-contrib/setup-purescript@main + with: + purescript: "0.14.0-rc3" - uses: actions/setup-node@v1 with: node-version: "10" - - name: Install dependencies - run: | - npm install -g bower - npm install - bower install --production + - name: Install NPM dependencies + run: npm install - name: Build source run: npm run-script build - name: Run tests - run: | - bower install - npm run-script test --if-present + run: npm run-script test --if-present diff --git a/package.json b/package.json index 02e36ea..8ae99e2 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,9 @@ { "private": true, "scripts": { - "clean": "rimraf output && rimraf .pulp-cache", - "build": "eslint src && pulp build -- --censor-lib --strict" + "build": "eslint src && spago build --purs-args '--censor-lib --strict'" }, "devDependencies": { - "eslint": "^4.19.1", - "pulp": "^12.2.0", - "purescript-psa": "^0.6.0", - "rimraf": "^2.6.2" + "eslint": "^7.6.0" } } diff --git a/packages.dhall b/packages.dhall new file mode 100644 index 0000000..ac62859 --- /dev/null +++ b/packages.dhall @@ -0,0 +1,4 @@ +let upstream = + https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201206/packages.dhall + +in upstream diff --git a/spago.dhall b/spago.dhall new file mode 100644 index 0000000..1355dd9 --- /dev/null +++ b/spago.dhall @@ -0,0 +1,10 @@ +{- +Welcome to a Spago project! +You can edit this file as you like. +-} +{ name = "web-socket" +, dependencies = + [ "arraybuffer-types", "psci-support", "web-file" ] +, packages = ./packages.dhall +, sources = [ "src/**/*.purs" ] +} From 959b7645507335c0f33ca1d1f4977114cfd54acb Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 8 Dec 2020 06:50:28 -0800 Subject: [PATCH 3/5] Use prepare-0.14 package set --- packages.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.dhall b/packages.dhall index ac62859..5027336 100644 --- a/packages.dhall +++ b/packages.dhall @@ -1,4 +1,4 @@ let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201206/packages.dhall + https://raw.githubusercontent.com/purescript/package-sets/prepare-0.14/src/packages.dhall in upstream From 14b6ffd2223980a98d02ad891f1006fbdffb86b1 Mon Sep 17 00:00:00 2001 From: JordanMartinez Date: Tue, 8 Dec 2020 17:11:16 -0800 Subject: [PATCH 4/5] Remove opening spago.dhall comment --- spago.dhall | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spago.dhall b/spago.dhall index 1355dd9..111be00 100644 --- a/spago.dhall +++ b/spago.dhall @@ -1,7 +1,3 @@ -{- -Welcome to a Spago project! -You can edit this file as you like. --} { name = "web-socket" , dependencies = [ "arraybuffer-types", "psci-support", "web-file" ] From 5f21edfbe6b8686ba998ab3cc72744dbe3554c78 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 8 Dec 2020 17:12:34 -0800 Subject: [PATCH 5/5] Update bower dependencies to master --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 5b16a72..ed83ed2 100644 --- a/bower.json +++ b/bower.json @@ -15,7 +15,7 @@ "package.json" ], "dependencies": { - "purescript-arraybuffer-types": "^2.0.0", - "purescript-web-file": "^2.0.0" + "purescript-arraybuffer-types": "master", + "purescript-web-file": "master" } }