chore: cleanup CI debugging things

Author: lukewilliamboswell

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
       - run: expect -v
 
       - name: Build platform binary
-        run: ./roc_nightly/roc ./build.roc --release --path ./ --roc ./roc_nightly/roc
+        run: ./roc_nightly/roc ./build.roc --release --cli ./roc_nightly/roc
 
       - name: Run all tests
         run: ROC=./roc_nightly/roc EXAMPLES_DIR=./examples/ ./ci/all_tests.sh

.github/workflows/ci_nix.yml

@@ -32,7 +32,7 @@ jobs:
         run: uname -m
 
       - name: Build platform binary
-        run: nix develop -c sh -c 'roc ./build.roc --release --path ./ --roc roc'
+        run: nix develop -c sh -c 'roc ./build.roc --release'
 
       - name: Run all tests
         run: nix develop -c sh -c 'export ROC=roc && export EXAMPLES_DIR=./examples/ && ./ci/all_tests.sh'

build.roc

@@ -7,27 +7,16 @@ import cli.Task exposing [Task]
 import cli.Cmd
 import cli.Stdout
 import cli.Env
-import cli.File
 import cli.Arg
 import weaver.Opt
 import weaver.Cli
 
-RocTarget : [
-    MacosArm64,
-    MacosX64,
-    LinuxArm64,
-    LinuxX64,
-    WindowsArm64,
-    WindowsX64,
-]
-
 main =
 
     cliParser =
         Cli.weave {
             release: <- Opt.flag { short: "r", long: "release", help: "Release build" },
-            path: <- Opt.maybeStr { short: "p", long: "path", help: "Path to the workspace root"},
-            roc: <- Opt.str { short: "d", long: "roc", help: "Path to the roc binary"},
+            maybeRoc: <- Opt.maybeStr { short: "c", long: "cli", help: "Path to the roc cli"},
         }
         |> Cli.finish {
             name: "basic-webserver",
@@ -41,36 +30,25 @@ main =
         Ok args -> run args
         Err message -> Task.err (Exit 1 message)
 
-run = \{ release, path, roc } ->
-
-    root = path |> Result.withDefault ""
+run = \{ release, maybeRoc } ->
 
-    info! "Checking working directory ..."
-    "$(root)flake.nix"
-        |> File.isFile
-        |> Task.await \exists -> if exists then Task.ok {} else Task.err (ErrInvalidWorkingDir root)
-        |> Task.mapErr! \err -> ErrWorkingDirectory err root
-
-    info! "Listing working directory ..."
-    "ls"
-        |> Cmd.exec  ["-R", "$(root)"]
-        |> Task.mapErr! ErrListingWorkingDir
+    roc = maybeRoc |> Result.withDefault "roc"
 
     info! "Generating glue for builtins ..."
     roc
-        |> Cmd.exec  ["glue", "$(root)glue.roc", "$(root)crates/", "$(root)platform/main.roc"]
+        |> Cmd.exec  ["glue", "glue.roc", "crates/", "platform/main.roc"]
         |> Task.mapErr! ErrGeneratingGlue
 
     info! "Getting the native target ..."
     target =
         Env.platform
         |> Task.await! getNativeTarget
 
-    stubPath = "$(root)platform/libapp.$(stubExt target)"
+    stubPath = "platform/libapp.$(stubExt target)"
 
     info! "Building stubbed app shared library ..."
     roc
-        |> Cmd.exec  ["build", "--lib", "$(root)platform/libapp.roc", "--output", stubPath]
+        |> Cmd.exec  ["build", "--lib", "platform/libapp.roc", "--output", stubPath]
         |> Task.mapErr! ErrBuildingAppStub
 
     (cargoBuildArgs, message) =
@@ -84,31 +62,31 @@ run = \{ release, path, roc } ->
         |> Cmd.exec  cargoBuildArgs
         |> Task.mapErr! ErrBuildingHostBinaries
 
-    hostBuildPath = if release then "$(root)target/release/libhost.a" else "$(root)target/debug/libhost.a"
-    hostDestPath = "$(root)platform/$(prebuiltStaticLibrary target)"
+    hostBuildPath = if release then "target/release/libhost.a" else "target/debug/libhost.a"
+    hostDestPath = "platform/$(prebuiltStaticLibrary target)"
 
     info! "Moving the prebuilt binary from $(hostBuildPath) to $(hostDestPath) ..."
     "cp"
         |> Cmd.exec  [hostBuildPath, hostDestPath]
         |> Task.mapErr! ErrMovingPrebuiltLegacyBinary
 
-    # TODO remove this, just a temporary workaround to see if this makes CI happy
-    # if so we know that linux requires an object `.o` file for some reason...
-    prebuiltObjectPath = "$(root)platform/$(prebuiltObject target)"
-    info! "Moving the prebuilt binary from $(hostBuildPath) to $(prebuiltObjectPath) ..."
-    "cp"
-        |> Cmd.exec  [hostBuildPath, prebuiltObjectPath]
-        |> Task.mapErr! ErrMovingPrebuiltLegacyObject
-
-    # SURGICAL LINKER IS NOT YET SUPPORTED need to merge https://github.com/roc-lang/roc/pull/6808
-    #info! "Preprocessing surgical host ..."
-    #surgicalBuildPath = if release then "target/release/host" else "target/debug/host"
-    #roc
-    #    |> Cmd.exec  ["preprocess-host", surgicalBuildPath, "platform/main.roc", stubPath]
-    #    |> Task.mapErr! ErrPreprocessingSurgicalBinary
+    info! "Preprocessing surgical host ..."
+    surgicalBuildPath = if release then "target/release/host" else "target/debug/host"
+    roc
+        |> Cmd.exec  ["preprocess-host", surgicalBuildPath, "platform/main.roc", stubPath]
+        |> Task.mapErr! ErrPreprocessingSurgicalBinary
 
     info! "Successfully completed building platform binaries."
 
+RocTarget : [
+    MacosArm64,
+    MacosX64,
+    LinuxArm64,
+    LinuxX64,
+    WindowsArm64,
+    WindowsX64,
+]
+
 getNativeTarget : _ -> Task RocTarget _
 getNativeTarget =\{os, arch} ->
     when (os, arch) is
@@ -135,16 +113,6 @@ prebuiltStaticLibrary = \target ->
         WindowsArm64 -> "windows-arm64.lib"
         WindowsX64 -> "windows-x64.lib"
 
-prebuiltObject : RocTarget -> Str
-prebuiltObject = \target ->
-    when target is
-        MacosArm64 -> "macos-arm64.a"
-        MacosX64 -> "macos-x64.a"
-        LinuxArm64 -> "linux-arm64.a"
-        LinuxX64 -> "linux-x64.a"
-        WindowsArm64 -> "windows-arm64.lib"
-        WindowsX64 -> "windows-x64.lib"
-
 info : Str -> Task {} _
 info = \msg ->
     Stdout.line! "\u(001b)[34mINFO:\u(001b)[0m $(msg)"