Merge pull request #58 from lukewilliamboswell/builtin-task

Add Task as a builtin module/type

Author: smores56

.github/workflows/ci.yml

@@ -7,6 +7,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  JUMP_START: 1
+  ROC: ./roc_nightly/roc
+  EXAMPLES_DIR: ./examples/
+
 jobs:
   build-and-test:
     runs-on: [ubuntu-22.04]
@@ -43,7 +48,7 @@ jobs:
         run: expect -v
 
       # Run all tests
-      - run: ROC=./roc_nightly/roc EXAMPLES_DIR=./examples/ ./ci/all_tests.sh
+      - run: ./ci/all_tests.sh
 
       - name: Install dependencies for musl build
         run: |
@@ -56,23 +61,6 @@ jobs:
       - name: Test using musl build
         run: |
           # no need to build platform anymore
-          sed -i '/build\.roc\|jump-start\.sh/d' ./ci/all_tests.sh
-          ROC=./roc_nightly/roc EXAMPLES_DIR=./examples/ ./ci/all_tests.sh
+          NO_BUILD=1 ./ci/all_tests.sh
 
-    
-      - name: build example in README.md
-        run: |
-          roc_block_count=$(grep -c '```roc' README.md)
-          
-          # Error if more than one Roc code block
-          if [ $roc_block_count -gt 1 ]; then
-            echo "Error: Found $roc_block_count Roc code blocks in README.md. I only know how to test one. Modify this CI step to test them all."
-            exit 1
-          fi
-
-          # Extract roc code block from README.md
-          sed -n '/```roc/,/```/p' README.md | sed '1d;$d' > readme.roc
-
-          # Build the code to make sure it works
-          ./roc_nightly/roc build readme.roc --linker=legacy
 # TODO clippy, rustfmt, roc fmt check

.github/workflows/ci_nix.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: cachix/install-nix-action@v23
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-          
+
       - name: Run all tests
         run: nix develop -c sh -c 'export ROC=roc && export EXAMPLES_DIR=./examples/ && ./ci/all_tests.sh'
 

build.roc

@@ -1,8 +1,7 @@
 app [main] {
-    cli: platform "https://github.com/roc-lang/basic-cli/releases/download/0.14.0/dC5ceT962N_4jmoyoffVdphJ_4GlW3YMhAPyGPr-nU0.tar.br",
+    cli: platform "https://github.com/roc-lang/basic-cli/releases/download/0.15.0/SlwdbJ-3GR7uBWQo6zlmYWNYOxnvo8r6YABXD-45UOw.tar.br",
 }
 
-import cli.Task exposing [Task]
 import cli.Cmd
 import cli.Stdout
 import cli.Env
@@ -90,9 +89,9 @@ getRustTargetFolder =
                 Task.ok "target/release/"
             else
                 Task.ok "target/$(targetEnvVar)/release/"
-        Err e -> 
+        Err e ->
             info! "Failed to get env var CARGO_BUILD_TARGET with error \(Inspect.toStr e). Assuming default CARGO_BUILD_TARGET (native)..."
-            
+
             Task.ok "target/release/"
 
 cargoBuildHost : Task {} _

ci/all_tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
-set -euxo pipefail
+set -exo pipefail
 
 
 if [ -z "${ROC}" ]; then
@@ -23,8 +23,19 @@ if [ -z "${EXAMPLES_DIR}" ]; then
   exit 1
 fi
 
-echo "build the platform"
-$ROC ./build.roc --prebuilt-platform -- --roc $ROC
+if [ "$NO_BUILD" != "1" ]; then
+    if [ "$JUMP_START" == "1" ]; then
+    echo "building platform..."
+
+    # we can't use a release of basic-cli becuase we are making a breaking change
+    # let's build the platform using bash instead
+    bash jump-start.sh
+
+    else
+        # run build script for the platform which uses basic-cli
+        $ROC ./build.roc --prebuilt-platform -- --roc $ROC
+    fi
+fi
 
 echo "roc check"
 for roc_file in $EXAMPLES_DIR*.roc; do

ci/expect_scripts/dir.exp

@@ -7,22 +7,13 @@ set timeout 7
 
 spawn $env(EXAMPLES_DIR)dir
 
-expect "Listening on <http://127.0.0.1:8000>\r\n" {
-    set curlOutput [exec curl -sS localhost:8000]
-
-    if {$curlOutput eq "Logged request"} {
-        expect -re {The current working directory is .*/basic-webserver\r\n} {
-            expect "Set cwd to examples/\r\n" {
-                expect "The paths are;\r\n" {
-                    expect -re {.*dir\.roc.*} {
-                        exit 0
-                    }
-                }
+expect -re {The current working directory is .*/basic-webserver\r\n} {
+    expect "Set cwd to examples/\r\n" {
+        expect "The paths are;\r\n" {
+            expect -re {.*dir\.roc.*} {
+                exit 0
             }
         }
-    } else {
-        puts "Error: curl output was different than expected: $curlOutput"
-        exit 1
     }
 }
 

crates/roc_fn/src/lib.rs

@@ -23,7 +23,7 @@ const ROC_HOSTED_FNS: &[HostedFn] = &[
     HostedFn {
         name: "envList",
         arg_types: &[],
-        ret_type: "roc_std::RocList<(roc_std::RocStr, roc_std::RocStr)>",
+        ret_type: "roc_std::RocResult<roc_std::RocList<(roc_std::RocStr, roc_std::RocStr)>, ()>",
     },
     HostedFn {
         name: "exePath",
@@ -38,42 +38,32 @@ const ROC_HOSTED_FNS: &[HostedFn] = &[
     HostedFn {
         name: "cwd",
         arg_types: &[],
-        ret_type: "roc_std::RocList<u8>",
+        ret_type: "roc_std::RocResult<roc_std::RocList<u8>,()>",
     },
     HostedFn {
         name: "stdoutLine",
         arg_types: &["&roc_std::RocStr"],
-        ret_type: "()",
+        ret_type: "roc_std::RocResult<(),RocStr>",
     },
     HostedFn {
         name: "stdoutWrite",
         arg_types: &["&roc_std::RocStr"],
-        ret_type: "()",
-    },
-    HostedFn {
-        name: "stdoutFlush",
-        arg_types: &[],
-        ret_type: "()",
+        ret_type: "roc_std::RocResult<(),RocStr>",
     },
     HostedFn {
         name: "stderrLine",
         arg_types: &["&roc_std::RocStr"],
-        ret_type: "()",
+        ret_type: "roc_std::RocResult<(),RocStr>",
     },
     HostedFn {
         name: "stderrWrite",
         arg_types: &["&roc_std::RocStr"],
-        ret_type: "()",
-    },
-    HostedFn {
-        name: "stderrFlush",
-        arg_types: &[],
-        ret_type: "()",
+        ret_type: "roc_std::RocResult<(),RocStr>",
     },
     HostedFn {
         name: "commandOutput",
         arg_types: &["&roc_app::InternalCommand"],
-        ret_type: "roc_app::InternalOutput",
+        ret_type: "roc_std::RocResult<roc_app::InternalOutput,()>",
     },
     HostedFn {
         name: "commandStatus",
@@ -83,45 +73,45 @@ const ROC_HOSTED_FNS: &[HostedFn] = &[
     HostedFn {
         name: "posixTime",
         arg_types: &[],
-        ret_type: "roc_std::U128",
+        ret_type: "roc_std::RocResult<roc_std::U128,()>",
     },
     HostedFn {
         name: "tcpConnect",
         arg_types: &["&roc_std::RocStr", "u16"],
-        ret_type: "roc_app::ConnectResult",
+        ret_type: "roc_std::RocResult<roc_app::ConnectResult,()>",
     },
     HostedFn {
         name: "tcpClose",
         arg_types: &["*mut std::io::BufReader<std::net::TcpStream>"],
-        ret_type: "()",
+        ret_type: "roc_std::RocResult<(),()>",
     },
     HostedFn {
         name: "tcpReadUpTo",
         arg_types: &["usize", "*mut std::io::BufReader<std::net::TcpStream>"],
-        ret_type: "roc_app::ReadResult",
+        ret_type: "roc_std::RocResult<roc_app::ReadResult,()>",
     },
     HostedFn {
         name: "tcpReadExactly",
         arg_types: &["usize", "*mut std::io::BufReader<std::net::TcpStream>"],
-        ret_type: "roc_app::ReadExactlyResult",
+        ret_type: "roc_std::RocResult<roc_app::ReadExactlyResult,()>",
     },
     HostedFn {
         name: "tcpReadUntil",
         arg_types: &["u8", "*mut std::io::BufReader<std::net::TcpStream>"],
-        ret_type: "roc_app::ReadResult",
+        ret_type: "roc_std::RocResult<roc_app::ReadResult,()>",
     },
     HostedFn {
         name: "tcpWrite",
         arg_types: &[
             "&roc_std::RocList<u8>",
             "*mut std::io::BufReader<std::net::TcpStream>",
         ],
-        ret_type: "roc_app::WriteResult",
+        ret_type: "roc_std::RocResult<roc_app::WriteResult,()>",
     },
     HostedFn {
         name: "sleepMillis",
         arg_types: &["u64"],
-        ret_type: "()",
+        ret_type: "roc_std::RocResult<(),()>",
     },
     HostedFn {
         name: "fileWriteUtf8",