From 151b90632c5fd75622a8c5f05242dd5f174fc9bc Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 08:36:56 -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 ef2046b..9647641 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,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 f5db2863646e29054172d4ef294562b6307e3140 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 08:36:56 -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 9647641..f87bf6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,3 +38,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 487f689d1aa46568da3d858c4c7b4fa4ef17532c Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 08:36:56 -0500 Subject: [PATCH 3/8] Ignore spago-based tests (temporarily) --- .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 f87bf6b..64c1360 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Build source run: spago build --no-install --purs-args '--censor-lib --strict' - - name: Run tests +# - name: Run tests run: spago test --no-install - name: Check formatting From f936df107901a935993df4a1c1be93b140f6b1b9 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 08:36:56 -0500 Subject: [PATCH 4/8] Update Bower dependencies to master or main --- bower.json | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bower.json b/bower.json index 04f61e8..bcb2258 100644 --- a/bower.json +++ b/bower.json @@ -14,30 +14,30 @@ "output" ], "dependencies": { - "purescript-argonaut-core": "^6.0.0", - "purescript-arrays": "^6.0.0", - "purescript-bifunctors": "^5.0.0", - "purescript-effect": "^3.0.0", - "purescript-either": "^5.0.0", - "purescript-foldable-traversable": "^5.0.0", - "purescript-foreign-object": "^3.0.0", - "purescript-identity": "^5.0.0", - "purescript-integers": "^5.0.0", - "purescript-lists": "^6.0.0", - "purescript-maybe": "^5.0.0", - "purescript-nonempty": "^6.0.0", - "purescript-ordered-collections": "^2.0.0", - "purescript-prelude": "^5.0.0", - "purescript-record": "^3.0.0", - "purescript-strings": "^5.0.0", - "purescript-tuples": "^6.0.0" + "purescript-argonaut-core": "main", + "purescript-arrays": "master", + "purescript-bifunctors": "master", + "purescript-effect": "master", + "purescript-either": "master", + "purescript-foldable-traversable": "master", + "purescript-foreign-object": "master", + "purescript-identity": "master", + "purescript-integers": "master", + "purescript-lists": "master", + "purescript-maybe": "master", + "purescript-nonempty": "master", + "purescript-ordered-collections": "master", + "purescript-prelude": "master", + "purescript-record": "master", + "purescript-strings": "master", + "purescript-tuples": "master" }, "devDependencies": { - "purescript-assert": "^5.0.0", - "purescript-console": "^5.0.0", - "purescript-exceptions": "^5.0.0", - "purescript-gen": "^3.0.0", - "purescript-quickcheck": "^7.0.0", - "purescript-transformers": "^5.0.0" + "purescript-assert": "master", + "purescript-console": "master", + "purescript-exceptions": "master", + "purescript-gen": "master", + "purescript-quickcheck": "master", + "purescript-transformers": "master" } } From a74830aaeb1e51120d0df7e47cdb6c9ab2f7c21d Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 08:36:56 -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 22d69c250f2f1105330a74cee207edd4b8bd3fbd Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 08:36:56 -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 796eeb7..3d4f73d 100644 --- a/spago.dhall +++ b/spago.dhall @@ -21,7 +21,6 @@ , "nonempty" , "ordered-collections" , "prelude" - , "psci-support" , "quickcheck" , "record" , "strings" From 34bb8a0a605c27b1bd30413e3e5fffaedbf5da8a Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:10:13 -0500 Subject: [PATCH 7/8] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75aa0d5..b9dbbf5 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 (#106 by @JordanMartinez) New features: From f9d35dce2911bb21b7f8488cb8a29c39e8757684 Mon Sep 17 00:00:00 2001 From: JordanMartinez Date: Tue, 22 Mar 2022 09:19:09 -0500 Subject: [PATCH 8/8] Update .github/workflows/ci.yml Co-authored-by: Thomas Honeyman --- .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 64c1360..ded9795 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: run: spago build --no-install --purs-args '--censor-lib --strict' # - name: Run tests - run: spago test --no-install +# run: spago test --no-install - name: Check formatting run: purs-tidy check src test