fix some things

Author: lukewilliamboswell

.github/workflows/release.yml

@@ -0,0 +1,222 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        description: 'Release tag (e.g., v0.1.0)'
+        required: true
+        type: string
+  pull_request:
+
+# Ensure only one release workflow runs at a time
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-and-bundle:
+    name: Build and Bundle Platform
+    runs-on: macos-15  # macOS can cross-compile to all targets
+    outputs:
+      bundle_filename: ${{ steps.bundle.outputs.bundle_filename }}
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Zig
+        uses: mlugg/setup-zig@v2
+        with:
+          version: 0.15.2
+
+      - name: Install Rust with cross-compilation targets
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-apple-darwin,aarch64-apple-darwin,x86_64-unknown-linux-musl,aarch64-unknown-linux-musl
+
+      - name: Build Roc from pinned commit
+        run: |
+          echo "Building roc from pinned commit..."
+          ROC_COMMIT=$(python3 ci/get_roc_commit.py)
+
+          git init roc-src
+          cd roc-src
+          git remote add origin https://github.com/roc-lang/roc
+          git fetch --depth 1 origin "$ROC_COMMIT"
+          git checkout --detach "$ROC_COMMIT"
+
+          zig build roc
+
+          echo "$(pwd)/zig-out/bin" >> "$GITHUB_PATH"
+
+      - name: Build platform for all targets
+        run: ./build.sh --all
+
+      - name: Bundle platform
+        id: bundle
+        run: |
+          # Run bundle.sh and capture output
+          BUNDLE_OUTPUT=$(./bundle.sh 2>&1)
+          echo "$BUNDLE_OUTPUT"
+
+          # Extract the tar.zst filename from "Created: /path/to/HASH.tar.zst" line
+          BUNDLE_PATH=$(echo "$BUNDLE_OUTPUT" | grep "^Created:" | awk '{print $2}')
+          BUNDLE_FILENAME=$(basename "$BUNDLE_PATH")
+
+          if [ -z "$BUNDLE_FILENAME" ]; then
+            echo "Error: Could not extract bundle filename from output"
+            echo "Bundle output was:"
+            echo "$BUNDLE_OUTPUT"
+            exit 1
+          fi
+
+          echo "Bundle created: $BUNDLE_FILENAME"
+          echo "bundle_filename=$BUNDLE_FILENAME" >> "$GITHUB_OUTPUT"
+
+      - name: Upload bundle artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: platform-bundle
+          path: ${{ steps.bundle.outputs.bundle_filename }}
+          retention-days: 30
+
+  test-bundle:
+    name: Test Bundle (${{ matrix.os }})
+    needs: build-and-bundle
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-15          # Apple Silicon
+          - macos-15-intel    # Intel Mac
+          - ubuntu-22.04      # Linux x86_64
+          - ubuntu-24.04-arm  # Linux ARM64
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Zig
+        uses: mlugg/setup-zig@v2
+        with:
+          version: 0.15.2
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install expect (Ubuntu)
+        if: startsWith(matrix.os, 'ubuntu-')
+        run: sudo apt-get install -y expect
+
+      - name: Install expect (macOS)
+        if: startsWith(matrix.os, 'macos-')
+        run: brew install expect
+
+      - name: Build Roc from pinned commit
+        run: |
+          echo "Building roc from pinned commit..."
+          ROC_COMMIT=$(python3 ci/get_roc_commit.py)
+
+          git init roc-src
+          cd roc-src
+          git remote add origin https://github.com/roc-lang/roc
+          git fetch --depth 1 origin "$ROC_COMMIT"
+          git checkout --detach "$ROC_COMMIT"
+
+          zig build roc
+
+          echo "$(pwd)/zig-out/bin" >> "$GITHUB_PATH"
+
+      - name: Download bundle artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: platform-bundle
+
+      - name: Start HTTP server for bundle
+        run: |
+          # Start Python HTTP server in background on port 8000
+          python3 -m http.server 8000 &
+          HTTP_SERVER_PID=$!
+          echo "HTTP_SERVER_PID=$HTTP_SERVER_PID" >> "$GITHUB_ENV"
+
+          # Wait for server to start
+          sleep 5
+
+          # Verify server is running and bundle is accessible
+          if ! curl -f -I "http://localhost:8000/${{ needs.build-and-bundle.outputs.bundle_filename }}" > /dev/null 2>&1; then
+            echo "Error: HTTP server not accessible or bundle not found"
+            kill $HTTP_SERVER_PID || true
+            exit 1
+          fi
+
+          echo "HTTP server started on port 8000 (PID: $HTTP_SERVER_PID)"
+          echo "Bundle accessible at: http://localhost:8000/${{ needs.build-and-bundle.outputs.bundle_filename }}"
+
+      - name: Modify examples to use bundled platform
+        run: |
+          # Replace local platform path with HTTP URL in all examples
+          for example in examples/*.roc; do
+            sed -i.bak "s|platform \"../platform/main.roc\"|platform \"http://localhost:8000/${{ needs.build-and-bundle.outputs.bundle_filename }}\"|g" "$example"
+          done
+
+          # Show diff for verification
+          echo "Modified examples:"
+          git diff examples/ | head -50
+
+      - name: Run tests with bundled platform
+        run: |
+          # Skip native build since we're using the bundle
+          # The test script will detect all targets exist and use bundle testing
+          export NO_BUILD=1
+
+          # Run all tests against the bundled platform
+          bash ci/all_tests.sh
+
+  create-release:
+    name: Create GitHub Release
+    needs: [build-and-bundle, test-bundle]
+    runs-on: ubuntu-24.04
+    # Only run on manual trigger
+    if: github.event_name == 'workflow_dispatch'
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download bundle artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: platform-bundle
+
+      - name: Create GitHub Release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          BUNDLE_FILE=$(ls *.tar.zst | head -1)
+
+          if [ -z "$BUNDLE_FILE" ]; then
+            echo "Error: No bundle file found"
+            exit 1
+          fi
+
+          ROC_COMMIT=$(python3 ci/get_roc_commit.py | cut -c1-8)
+
+          # Create release with auto-generated notes
+          gh release create "${{ github.event.inputs.release_tag }}" \
+            "$BUNDLE_FILE" \
+            --title "${{ github.event.inputs.release_tag }}" \
+            --generate-notes \
+            --notes "Platform bundle built with Rust (stable) and Roc $ROC_COMMIT"
+
+          echo "Release created: ${{ github.event.inputs.release_tag }}"
+          echo "Bundle uploaded: $BUNDLE_FILE"

.gitignore

@@ -84,3 +84,6 @@ platform/targets/*/libhost.a
 
 # Cargo lock for reproducible builds
 !Cargo.lock
+
+# Bundled platform package
+*.tar.zst

CONTRIBUTING.md

@@ -6,12 +6,4 @@ We are committed to providing a friendly, safe and welcoming environment for all
 
 ## How to generate docs?
 
-You can generate the documentation locally and then start a web server to host your files.
-
-```bash
-roc docs platform/main.roc
-cd generated-docs
-simple-http-server --nocache --index # comes pre-installed if you use `nix develop`, otherwise use `cargo install simple-http-server`.
-```
-
-Open http://0.0.0.0:8000 in your browser
+TODO describe how to generate docs once `roc docs` is implemented in the new compiler

Cargo.lock

@@ -16,6 +16,7 @@ roc_std_new.workspace = true
 roc_io_error.workspace = true
 roc_random.workspace = true
 roc_command.workspace = true
+memoffset = "0.9.1"
 
 [workspace]
 members = [
@@ -33,7 +34,7 @@ repository = "https://github.com/roc-lang/basic-cli"
 
 [workspace.dependencies]
 # Core Roc types
-roc_std_new = { git = "https://github.com/roc-lang/roc", rev = "8753d9a30189d878b54d2a4981becf88ad4bbb1a" }
+roc_std_new = { git = "https://github.com/roc-lang/roc", rev = "386a79b49fd6d46075bf5bb562e57062e6a53c79" }
 
 # Internal crates
 roc_io_error = { path = "crates/roc_io_error" }

Cargo.toml

@@ -8,26 +8,39 @@
 A Roc [platform](https://github.com/roc-lang/roc/wiki/Roc-concepts-explained#platform) to work with files, commands, HTTP, TCP, command line arguments,...
 
 :eyes: **examples**:
-  - [0.20.0](https://github.com/roc-lang/basic-cli/tree/0.20.0/examples)
-  - [0.19.0](https://github.com/roc-lang/basic-cli/tree/0.19.0/examples)
-  - [0.18.0](https://github.com/roc-lang/basic-cli/tree/0.18.0/examples)
   - [latest main branch](https://github.com/roc-lang/basic-cli/tree/main/examples)
 
 :book: **documentation**:
-  - [0.20.0](https://roc-lang.github.io/basic-cli/0.20.0/)
-  - [0.19.0](https://roc-lang.github.io/basic-cli/0.19.0/)
-  - [0.18.0](https://roc-lang.github.io/basic-cli/0.18.0/)
-  - [latest main branch](https://roc-lang.github.io/basic-cli/main/)
+  - TBA -- `roc docs` not yet implemented in the new compiler
 
 ## Running Locally
 
-If you clone this repo instead of using the release URL you'll need to build the platform once:
-```sh
-./jump-start.sh
-roc build.roc --linker=legacy
+**⚠️ IMPORTANT**: This branch (`migrate-zig-compiler`) requires the new Roc compiler and `roc_std_new` to be at matching versions to avoid ABI layout mismatches.
+
+### Version Requirements
+
+The `roc_std_new` dependency version in `Cargo.toml` MUST match your local Roc compiler version:
+
+```toml
+# In Cargo.toml, update this to match your Roc compiler commit:
+roc_std_new = { path = "/path/to/your/roc/crates/roc_std_new" }
+# OR
+roc_std_new = { git = "https://github.com/roc-lang/roc", rev = "YOUR_COMMIT_HASH" }
 ```
-Then you can run like usual:
+
+**To check your Roc compiler version:**
 ```sh
-$ roc examples/hello-world.roc
-Hello, World!
+roc --version  # Shows commit hash
+cd /path/to/roc && git log -1 --format="%H"  # Full commit hash
 ```
+
+### Migration Status
+
+This branch migrates basic-cli to the new Zig-based Roc compiler and RocOps ABI.
+
+**✅ Completed:**
+- All core modules (Cmd, File, Dir, Path, Env, Random, Sleep, Utc, Stdin/Stdout/Stderr)
+- Single-variant tag union layout fix (RocSingleTagWrapper now correctly includes discriminant)
+- Comprehensive testing and verification
+
+**Note:** Single-variant tag unions (e.g., `[PathErr(IOErr)]`) are represented in the Roc ABI with a discriminant byte (always 0) even though there's only one variant. The `RocSingleTagWrapper<T>` type implements this standard Roc ABI layout. This type could potentially be upstreamed to `roc_std_new` for reuse across platforms.

README.md

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+root_dir="$(cd "$(dirname "$0")" && pwd)"
+cd "$root_dir/platform"
+
+# Collect all .roc files
+roc_files=(*.roc)
+
+# Collect all host libraries and runtime files from targets directories
+lib_files=()
+for lib in targets/*/*.a targets/*/*.o; do
+    if [[ -f "$lib" ]]; then
+        lib_files+=("$lib")
+    fi
+done
+
+echo "Bundling ${#roc_files[@]} .roc files and ${#lib_files[@]} library files..."
+echo ""
+echo "Files to bundle:"
+for f in "${roc_files[@]}"; do
+    echo "  $f"
+done
+for f in "${lib_files[@]}"; do
+    echo "  $f"
+done
+echo ""
+
+roc bundle "${roc_files[@]}" "${lib_files[@]}" --output-dir "$root_dir" "$@"