Skip to content

Commit

Permalink
Merge pull request peterbecich#2 from peterbecich/spago-upgrade
Browse files Browse the repository at this point in the history
Spago upgrade
  • Loading branch information
peterbecich authored Feb 25, 2024
2 parents 6f5008a + d56a437 commit 5c86b32
Show file tree
Hide file tree
Showing 19 changed files with 18,991 additions and 414 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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 ../../../
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/purescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
72 changes: 0 additions & 72 deletions example/packages.dhall

This file was deleted.

27 changes: 0 additions & 27 deletions example/spago.dhall

This file was deleted.

Loading

0 comments on commit 5c86b32

Please sign in to comment.