From af2d7d56127706cb2211430c34bbc1b0fb163176 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:21:08 -0500 Subject: [PATCH 1/8] Update to CI to use 'unstable' purescript --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b68d92..deaf561 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: - name: Set up a PureScript toolchain uses: purescript-contrib/setup-purescript@main with: + purescript: "unstable" purs-tidy: "latest" - name: Cache PureScript dependencies From 80ccf8569ef0b9de7296158ca2ca545463a25f9c Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:21:08 -0500 Subject: [PATCH 2/8] Add CI test: verify 'bower.json' file works via pulp --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index deaf561..53d7698 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,3 +37,12 @@ jobs: - name: Check formatting run: purs-tidy check src test + + - name: Verify Bower & Pulp + run: | + npm install bower pulp@16.0.0-0 + npx bower install + npx pulp build -- --censor-lib --strict + if [ -d "test" ]; then + npx pulp test + fi From ef9e8aae9d31f7f074f68dbaa60006a4a00af4ae Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:21:08 -0500 Subject: [PATCH 3/8] Ignore spago-based tests (temporarily) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53d7698..ec70cdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,8 +32,8 @@ jobs: - name: Build source run: spago build --no-install --purs-args '--censor-lib --strict' - - name: Run tests - run: spago test --no-install +# - name: Run tests +# run: spago test --no-install - name: Check formatting run: purs-tidy check src test From 990ff4e4ee0b8568cd9050499e33725c0236a671 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:21:08 -0500 Subject: [PATCH 4/8] Update Bower dependencies to master or main --- bower.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bower.json b/bower.json index b7b0ab5..19584ce 100644 --- a/bower.json +++ b/bower.json @@ -14,17 +14,17 @@ "package.json" ], "dependencies": { - "purescript-foldable-traversable": "^5.0.0", - "purescript-maybe": "^5.0.0", - "purescript-newtype": "^4.0.0", - "purescript-prelude": "^5.0.0", - "purescript-strings": "^5.0.0", - "purescript-tuples": "^6.0.0", - "purescript-js-uri": "https://github.com/purescript-contrib/purescript-js-uri.git#2.0.0" + "purescript-foldable-traversable": "master", + "purescript-maybe": "master", + "purescript-newtype": "master", + "purescript-prelude": "master", + "purescript-strings": "master", + "purescript-tuples": "master", + "purescript-js-uri": "main" }, "devDependencies": { - "purescript-assert": "^5.0.0", - "purescript-console": "^5.0.0", - "purescript-effect": "^3.0.0" + "purescript-assert": "master", + "purescript-console": "master", + "purescript-effect": "master" } } From 5aafd15840614f54ce4c591af13ea05ac86deb13 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:21:08 -0500 Subject: [PATCH 5/8] Update packages.dhall to 'prepare-0.15' package set --- packages.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.dhall b/packages.dhall index 7a6905b..582d6d3 100644 --- a/packages.dhall +++ b/packages.dhall @@ -1,4 +1,4 @@ let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c + https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall in upstream From a68dccea66c736c6094591b850ba6bc5e2b302b6 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:21:08 -0500 Subject: [PATCH 6/8] Removed unneeded 'psci-support' package --- spago.dhall | 1 - 1 file changed, 1 deletion(-) diff --git a/spago.dhall b/spago.dhall index fb6fe2e..2c44cf3 100644 --- a/spago.dhall +++ b/spago.dhall @@ -8,7 +8,6 @@ , "maybe" , "newtype" , "prelude" - , "psci-support" , "strings" , "tuples" ] From 6e1c02efca71c30e60d26ca93b44e1e2cd4e4149 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 14:25:52 -0500 Subject: [PATCH 7/8] Fix js-uri dep since not in bower registry --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 19584ce..28e7565 100644 --- a/bower.json +++ b/bower.json @@ -20,7 +20,7 @@ "purescript-prelude": "master", "purescript-strings": "master", "purescript-tuples": "master", - "purescript-js-uri": "main" + "purescript-js-uri": "https://github.com/purescript-contrib/purescript-js-uri.git#main" }, "devDependencies": { "purescript-assert": "master", From 9610271ea2abc545fb7c03d01f79d9657a4c56c0 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 14:26:48 -0500 Subject: [PATCH 8/8] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a28ed8..0b57077 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based ## [Unreleased] Breaking changes: +- Update project and deps to PureScript v0.15.0 (#27 by @JordanMartinez) New features: