complete upgrade to new Spago@next

flip111 · Feb 25, 2024 · d56a437 · d56a437
1 parent 83a204d
commit d56a437
Show file tree

Hide file tree

Showing 16 changed files with 18,907 additions and 315 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
@@ -91,7 +93,6 @@ jobs:
         # There are two PureScript projects which the Haskell tests build and run.
         # The first build produces warnings which cause the Haskell tests to fail;
         # pre-building these two projects clears these warnings.
-        spago build
         cd test/RoundTripArgonautAesonGeneric/app
         spago build
         cd ../../../

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