complete upgrade to new Spago@next

eskimor · Feb 25, 2024 · 442924f · 442924f
1 parent 83a204d
commit 442924f
Show file tree

Hide file tree

Showing 17 changed files with 13,737 additions and 326 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -54,10 +54,15 @@ jobs:
           dist-newstyle
         key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local
 
-    - name: Set up a PureScript toolchain
-      uses: purescript-contrib/setup-purescript@main
-      with: # https://github.com/purescript-contrib/setup-purescript#specify-versions
-        purescript: "0.15.13"
+    # - name: Set up a PureScript toolchain
+    #   uses: purescript-contrib/setup-purescript@main
+    #   with: # https://github.com/purescript-contrib/setup-purescript#specify-versions
+    #     spago: "latest"
+    #     purescript: "0.15.13"
+
+    - name: Set up new Spago
+      run: npm install -g spago@next purescript
+
     - name: Cache PureScript dependencies
       uses: actions/cache@v2
       with:
@@ -75,9 +80,6 @@ jobs:
     - name: Build Haskell
       run: |
         cabal build all --enable-tests --disable-optimization 2>&1 | tee build.log
-    - name: Build PureScript
-      run: |
-        spago build
     - name: Build PureScript Argonaut test project
       run: |
         cd test/RoundTripArgonautAesonGeneric/app

diff --git a/.github/workflows/purescript.yml b/.github/workflows/purescript.yml
@@ -19,10 +19,14 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up a PureScript toolchain
-        uses: purescript-contrib/setup-purescript@main
-        with: # https://github.com/purescript-contrib/setup-purescript#specify-versions
-          purescript: "0.15.13"
+      # - name: Set up a PureScript toolchain
+      #   uses: purescript-contrib/setup-purescript@main
+      #   with: # https://github.com/purescript-contrib/setup-purescript#specify-versions
+      #     spago: "latest"
+      #     purescript: "0.15.13"
+
+      - name: Set up new Spago
+        run: npm install -g spago@next purescript
 
       - name: Cache PureScript dependencies
         uses: actions/cache@v2
@@ -38,10 +42,10 @@ jobs:
           spago install
 
       - name: Build source
-        run: spago build --no-install
+        run: spago build
 
       - name: Bundle app
-        run: spago bundle-app --to static/index.js
+        run: spago bundle --bundle-type app --outfile static/index.js
 
       - name: Run tests
-        run: spago test --no-install
+        run: spago test
diff --git a/example/test/Main.purs b/example/test/Main.purs
@@ -8,4 +8,4 @@ import Effect.Class.Console (log)
 main :: Effect Unit
 main = do
   log "🍝"
-  log "You should add some tests."
+  log "empty test necessary to prevent `spago test` from failing"
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -61,7 +61,7 @@
           buildInputs = [
             pkgs.hello
             pkgs.purs
-            pkgs.spago
+            pkgs.spago-unstable
             pkgs.purs-tidy-bin.purs-tidy-0_10_0
             pkgs.purs-backend-es
             pkgs.purescript-language-server

diff --git a/purescript-bridge.cabal b/purescript-bridge.cabal
@@ -47,7 +47,7 @@ Test-Suite tests
                , RoundTripArgonautAesonGeneric.Types
                , RoundTripJsonHelpers.Spec
                , RoundTripJsonHelpers.Types
-  build-depends: aeson == 2.2.*
+  build-depends: aeson
                , bytestring
                , HUnit
                , base

diff --git a/spago.dhall b/spago.dhall
diff --git a/test/RoundTripArgonautAesonGeneric/app/packages.dhall b/test/RoundTripArgonautAesonGeneric/app/packages.dhall
diff --git a/test/RoundTripArgonautAesonGeneric/app/spago.dhall b/test/RoundTripArgonautAesonGeneric/app/spago.dhall