From 3bf8d1895bf0fc665d91ea6b4798a83de4224473 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:20:12 -0500 Subject: [PATCH 1/7] 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 dd41f2b30a164d3c979db2b71b93c9acf32c9923 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:20:12 -0500 Subject: [PATCH 2/7] 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 aa655554f0824710ed40518ec857534a5081e61f Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:20:12 -0500 Subject: [PATCH 3/7] 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 f87bf6b..ded9795 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,8 +33,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 c280f66210814d2623733266a841a1acac13d5fb Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:20:12 -0500 Subject: [PATCH 4/7] Update Bower dependencies to master or main --- bower.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bower.json b/bower.json index 83bd87e..5d59edc 100644 --- a/bower.json +++ b/bower.json @@ -16,15 +16,15 @@ }, "license": "MIT", "dependencies": { - "purescript-argonaut-codecs": "^8.0.0", - "purescript-argonaut-core": "^6.0.0", - "purescript-prelude": "^5.0.0", - "purescript-record": "^3.0.0" + "purescript-argonaut-codecs": "main", + "purescript-argonaut-core": "main", + "purescript-prelude": "master", + "purescript-record": "master" }, "devDependencies": { - "purescript-assert": "^5.0.0", - "purescript-console": "^5.0.0", - "purescript-effect": "^3.0.0", - "purescript-exceptions": "^5.0.0" + "purescript-assert": "master", + "purescript-console": "master", + "purescript-effect": "master", + "purescript-exceptions": "master" } } From 542ddbeb4dce6ced218776a07feecc18f790d5d9 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:20:13 -0500 Subject: [PATCH 5/7] 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 65f55c70f79a2d776ce141f943100617c091757d Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:20:13 -0500 Subject: [PATCH 6/7] Removed unneeded 'psci-support' package --- spago.dhall | 1 - 1 file changed, 1 deletion(-) diff --git a/spago.dhall b/spago.dhall index 6465a1b..41d35f1 100644 --- a/spago.dhall +++ b/spago.dhall @@ -13,7 +13,6 @@ , "foreign-object" , "partial" , "prelude" - , "psci-support" , "strings" ] , packages = ./packages.dhall From 5986bede01ebce216a073628c46f08568f17c437 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 22 Mar 2022 09:29:38 -0500 Subject: [PATCH 7/7] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba8a2a9..882ae44 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 (#39 by @JordanMartinez) New features: