Stop including the versions file in the bundle (#19)

The versions.json file was previously being bundled into the build, which meant that subsequent runs of the tool would always point to the same point in time instead of updating with the version of the file in dist.

Also, this PR fixes the names for Spago binaries, which have changed a bit version to version.

Author: thomashoneyman

.github/workflows/integration.yml

@@ -1,9 +1,9 @@
 name: Integration
 
 on:
+  push:
+    branches: [main]
   pull_request:
-    types: [synchronize]
-  push: {}
   schedule:
     - cron: "0 5 * * *"
 
@@ -24,9 +24,12 @@ jobs:
 
       - name: Check purty is installed correctly
         run: purty src/Main.purs
-     
-      - name: Check spago, psa, and purs are installed correctly
-        run: spago build --purs-args '--censor-lib --strict --codegen corefn,js'
-      
-      - name: Check zephyr is installed correctly
-        run: zephyr -f Main.main
+
+      - name: Check spago and purs are installed correctly
+        # run: spago build --purs-args '--censor-lib --strict --codegen corefn,js'
+        run: |
+          purs --version
+          spago version
+
+      # - name: Check zephyr is installed correctly
+      #   run: zephyr -f Main.main

dist/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
 var Main = require("./output/index");
-var versions = require("./dist/versions.json");
 
-Main.main(versions)();
+Main.main();

dist/update.js

@@ -13,10 +13,10 @@
   "dependencies": {
     "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
-    "@actions/tool-cache": "^1.6.0",
-    "xhr2": "^0.2.0"
+    "@actions/tool-cache": "^1.6.1",
+    "xhr2": "^0.2.1"
   },
   "devDependencies": {
-    "@vercel/ncc": "^0.23.0"
+    "@vercel/ncc": "^0.27.0"
   }
 }

index.js

@@ -2,22 +2,28 @@ module Main where
 
 import Prelude
 
-import Control.Monad.Except.Trans (mapExceptT, runExceptT)
-import Data.Argonaut.Core (Json)
+import Control.Monad.Except.Trans (ExceptT(..), mapExceptT, runExceptT)
+import Data.Argonaut.Parser as Json
+import Data.Bifunctor (lmap)
 import Data.Either (Either(..))
 import Data.Foldable (traverse_)
 import Effect (Effect)
-import Effect.Aff (launchAff_, runAff_)
+import Effect.Aff (error, launchAff_, runAff_)
 import Effect.Class (liftEffect)
 import Effect.Exception (message)
 import GitHub.Actions.Core as Core
+import Node.Buffer as Buffer
+import Node.Encoding (Encoding(..))
+import Node.FS.Sync (readFile)
 import Setup.BuildPlan (constructBuildPlan)
 import Setup.GetTool (getTool)
 import Setup.UpdateVersions (updateVersions)
 
-main :: Json -> Effect Unit
-main json = runAff_ go $ runExceptT do
-  tools <- mapExceptT liftEffect $ constructBuildPlan json
+main :: Effect Unit
+main = runAff_ go $ runExceptT do
+  versionsString <- liftEffect $ Buffer.toString UTF8 =<< readFile "./dist/versions.json"
+  versionsJson <- ExceptT $ pure $ lmap error $ Json.jsonParser versionsString
+  tools <- mapExceptT liftEffect $ constructBuildPlan versionsJson
   liftEffect $ Core.info "Constructed build plan."
   traverse_ getTool tools
   liftEffect $ Core.info "Fetched tools."

package-lock.json

@@ -3,15 +3,17 @@ module Setup.Data.Tool where
 import Prelude
 
 import Affjax (URL)
+import Data.Either (fromRight)
 import Data.Enum (class Enum, upFromIncluding)
 import Data.Foldable (elem, fold)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Bounded (genericBottom, genericTop)
 import Data.Generic.Rep.Enum (genericPred, genericSucc)
-import Data.Version (Version)
+import Data.Version (Version, parseVersion)
 import Data.Version as Version
 import Node.Path (FilePath)
 import Node.Path as Path
+import Partial.Unsafe (unsafePartial)
 import Setup.Data.Platform (Platform(..), platform)
 
 data Tool
@@ -99,6 +101,8 @@ installMethod tool version = do
     formatGitHub' = formatGitHub <<< formatArgs
     formatBintray' = formatBintray <<< formatArgs
 
+    unsafeVersion str = unsafePartial fromRight $ parseVersion str
+
     executableName = case platform of
       Windows -> toolName <> ".exe"
       _ -> toolName
@@ -109,15 +113,27 @@ installMethod tool version = do
           Windows -> "win64"
           Mac -> "macos"
           Linux -> "linux64"
-      , getExecutablePath: \p -> Path.concat [ p, "purescript", executableName ]
+      , getExecutablePath:
+          \p -> Path.concat [ p, "purescript", executableName ]
       }
 
     Spago -> Tarball
-      { source: formatGitHub' $ case platform of
-          Windows -> "windows"
-          Mac -> "osx"
-          Linux -> "linux"
-      , getExecutablePath: \p -> Path.concat [ p, executableName ]
+      { source: formatGitHub'
+          -- Spago has changed naming conventions from version to version
+          if version >= unsafeVersion "0.18.1" then case platform of
+            Windows -> "Windows"
+            Mac -> "macOS"
+            Linux -> "Linux"
+          else if version == unsafeVersion "0.18.0" then case platform  of
+            Windows -> "windows-latest"
+            Mac -> "macOS-latest"
+            Linux -> "linux-latest"
+          else case platform of
+            Windows -> "windows"
+            Mac -> "osx"
+            Linux -> "linux"
+      , getExecutablePath:
+          \p -> Path.concat [ p, executableName ]
       }
 
     Psa ->