Merge pull request #1 from andys8/update-purescript-0154

Author: kazk

Dockerfile

@@ -6,17 +6,13 @@ RUN set -ex; \
     chown -R codewarrior: /workspace;
 
 RUN set -ex; \
-    curl -sL https://deb.nodesource.com/setup_8.x | bash -; \
+    curl -sL https://deb.nodesource.com/setup_16.x | bash -; \
     apt-get install -y nodejs; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/* /tmp/*;
 
-RUN set -ex; \
-    mkdir -p /opt/purescript; \
-    curl -fsSL https://github.com/purescript/purescript/releases/download/v0.12.2/linux64.tar.gz | tar xz -C /opt/purescript --strip-components=1; \
-    curl -fsSL https://github.com/purescript/psc-package/releases/download/v0.5.1/linux64.tar.gz | tar xz -C /opt/purescript --strip-components=1;
-
-RUN npm install -g pulp@12.3.1;
+RUN npm install -g purescript@0.15.4;
+RUN npm install -g spago@0.20.9;
 
 COPY --chown=codewarrior:codewarrior workspace/ /workspace
 WORKDIR /workspace
@@ -28,20 +24,15 @@ ENV USER=codewarrior \
     PATH=/opt/purescript:$PATH
 
 RUN set -ex; \
-    # TODO Properly package the reporter and install
-    mkdir /tmp/reporter; \
-    curl -fsSL https://github.com/codewars/purescript-spec-reporter-codewars/archive/refs/tags/v0.0.1.tar.gz | tar xz -C /tmp/reporter --strip-components=1; \
-    mv /tmp/reporter/src/Test /workspace/src/Test; \
-    rm -rf /tmp/reporter; \
     cd /workspace; \
     npm install; \
-# install packages
-    psc-package install; \
-# compile packages
-    psc-package build; \
-# ensure running `Main.purs` works
-    pulp run; \
-# ensure testing works
-    pulp test || true; \
-# clean up
+    # install packages
+    spago install; \
+    # compile packages
+    spago build; \
+    # ensure running `Main.purs` works
+    spago run; \
+    # ensure testing works
+    spago test || true; \
+    # clean up
     rm -rf ./src/Main.purs ./output/Main/ ./test/Example/ ./output/Example.ExampleSpec/;

README.md

@@ -7,7 +7,7 @@ Container image for PureScript
 ```bash
 W=/workspace
 # Create container
-C=$(docker container create --rm -w $W ghcr.io/codewars/purescript:latest pulp test)
+C=$(docker container create --rm -w $W ghcr.io/codewars/purescript:latest spago test)
 
 # Copy files from the examples directory
 docker container cp ./examples/passing/. $C:$W

bin/run

@@ -8,7 +8,7 @@ fi
 W=/workspace
 
 # Create container
-C=$(docker container create --rm -w $W $IMAGE pulp test)
+C=$(docker container create --rm -w $W $IMAGE spago test)
 
 # Copy files from the examples directory
 docker container cp examples/${1:-passing}/. $C:$W

workspace/.gitignore

@@ -0,0 +1,10 @@
+/bower_components/
+/node_modules/
+/.pulp-cache/
+/output/
+/generated-docs/
+/.psc-package/
+/.psc*
+/.purs*
+/.psa*
+/.spago

workspace/package-lock.json

@@ -0,0 +1,32 @@
+let upstream =
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220901/packages.dhall
+        sha256:f1531b29c21ac437ffe5666c1b6cc76f0a9c29d3c9d107ff047aa2567744994f
+
+let additions =
+      { spec-reporter-codewars =
+        { repo = "https://github.com/codewars/purescript-spec-reporter-codewars"
+        , version = "v0.2.0"
+        , dependencies =
+          [ "aff"
+          , "bigints"
+          , "console"
+          , "datetime"
+          , "debug"
+          , "effect"
+          , "exceptions"
+          , "foldable-traversable"
+          , "maybe"
+          , "prelude"
+          , "profunctor-lenses"
+          , "quickcheck"
+          , "rationals"
+          , "spec"
+          , "spec-discovery"
+          , "spec-quickcheck"
+          , "strings"
+          , "transformers"
+          ]
+        }
+      }
+
+in  upstream // additions

workspace/packages.dhall

@@ -0,0 +1,26 @@
+{ name = "cw-purescript"
+, dependencies =
+  [ "aff"
+  , "bigints"
+  , "console"
+  , "datetime"
+  , "debug"
+  , "effect"
+  , "either"
+  , "enums"
+  , "maybe"
+  , "ordered-collections"
+  , "prelude"
+  , "profunctor-lenses"
+  , "quickcheck"
+  , "rationals"
+  , "record"
+  , "spec"
+  , "spec-discovery"
+  , "spec-quickcheck"
+  , "spec-reporter-codewars"
+  , "tuples"
+  ]
+, packages = ./packages.dhall
+, sources = [ "src/**/*.purs", "test/**/*.purs" ]
+}

workspace/psc-package.json

@@ -1,15 +1,16 @@
 module Test.Main where
 
 import Prelude
+
 import Data.Maybe (Maybe(..))
+import Data.Time.Duration (Milliseconds(..))
 import Effect (Effect)
-
+import Effect.Aff (launchAff_)
 import Test.Spec.Discovery (discover)
-import Test.Spec.Runner (defaultConfig, run')
-
 import Test.Spec.Reporter.Codewars (codewarsReporter)
+import Test.Spec.Runner (defaultConfig, runSpec')
 
 main :: Effect Unit
-main = discover ".+Spec" >>= run' config [codewarsReporter]
+main = launchAff_ $ discover ".+Spec" >>= runSpec' config [ codewarsReporter ]
   where
-    config = defaultConfig { timeout = Just 12000 }
+  config = defaultConfig { timeout = Just (Milliseconds 12000.0) }