Merge pull request #111 from aaravlu/fix109

Embed CLI into editor packages and update tests

Author: deevus

.github/workflows/test-integration.yml

@@ -110,7 +110,7 @@ jobs:
       - name: Verify release files
         run: |
           # Check that all expected files exist
-          EXPECTED_FILES=("cli.exe" "cli.zip" "zed.exe" "zed.zip" "zed-opengl.exe" "zed-opengl.zip" "sha256sums.txt")
+          EXPECTED_FILES=("zed.zip" "zed-opengl.zip" "sha256sums.txt")
 
           for file in "${EXPECTED_FILES[@]}"; do
             if [ ! -f "release/$file" ]; then
@@ -135,22 +135,18 @@ jobs:
     strategy:
       matrix:
         scenario:
-          - name: "cli-only"
-            create_dx11: false
-            create_opengl: false
-            expected_files: 3
           - name: "dx11-only"
             create_dx11: true
             create_opengl: false
-            expected_files: 5
+            expected_files: 2
           - name: "opengl-only"
             create_dx11: false
             create_opengl: true
-            expected_files: 5
+            expected_files: 2
           - name: "both-builds"
             create_dx11: true
             create_opengl: true
-            expected_files: 7
+            expected_files: 3
 
     steps:
       - name: Checkout repository

.github/workflows/test.yml

@@ -52,33 +52,11 @@ jobs:
           # Run the script
           ./scripts/prepare-release.sh
 
-          # Verify outputs
-          if [ ! -f "release/cli.exe" ]; then
-            echo "❌ FAIL: Missing cli.exe"
-            exit 1
-          fi
-
-          if [ ! -f "release/cli.zip" ]; then
-            echo "❌ FAIL: Missing cli.zip"
-            exit 1
-          fi
-
-          if [ ! -f "release/zed.exe" ]; then
-            echo "❌ FAIL: Missing zed.exe"
-            exit 1
-          fi
-
           if [ ! -f "release/zed.zip" ]; then
             echo "❌ FAIL: Missing zed.zip"
             exit 1
           fi
 
-          if [ ! -f "release/zed-opengl.exe" ]; then
-            echo "❌ FAIL: Missing zed-opengl.exe"
-            exit 1
-          fi
-
-
           if [ ! -f "release/zed-opengl.zip" ]; then
             echo "❌ FAIL: Missing zed-opengl.zip"
             exit 1

scripts/prepare-release.sh

@@ -14,22 +14,33 @@ mkdir -p "$RELEASE_DIR"
 # Check if CLI build exists
 if [ -f "$ARTIFACTS_DIR/cli-release/cli.exe" ]; then
     echo "Found CLI build, adding to release..."
-    mv "$ARTIFACTS_DIR/cli-release/cli.exe" "$RELEASE_DIR/cli.exe"
-    zip -j "$RELEASE_DIR/cli.zip" -9 "$RELEASE_DIR/cli.exe"
+    mv "$ARTIFACTS_DIR/cli-release/cli.exe" "$ARTIFACTS_DIR/cli-release/zed.exe"
 fi
 
 # Check if DX11 build exists
 if [ -f "$ARTIFACTS_DIR/editor-dx11-release/zed.exe" ]; then
     echo "Found DX11 build, adding to release..."
-    mv "$ARTIFACTS_DIR/editor-dx11-release/zed.exe" "$RELEASE_DIR/zed.exe"
-    zip -j "$RELEASE_DIR/zed.zip" -9 "$RELEASE_DIR/zed.exe"
+
+    mkdir -p "$ARTIFACTS_DIR/editor-dx11-release/zed/bin"
+    mv "$ARTIFACTS_DIR/editor-dx11-release/zed.exe" "$ARTIFACTS_DIR/editor-dx11-release/zed"
+    cp "$ARTIFACTS_DIR/cli-release/zed.exe" "$ARTIFACTS_DIR/editor-dx11-release/zed/bin"
+
+    cd "$ARTIFACTS_DIR/editor-dx11-release"
+    zip -r "../../$RELEASE_DIR/zed.zip" -9 "zed/"
+    cd -
 fi
 
 # Check if OpenGL build exists
 if [ -f "$ARTIFACTS_DIR/editor-opengl-release/zed.exe" ]; then
     echo "Found OpenGL build, adding to release..."
-    mv "$ARTIFACTS_DIR/editor-opengl-release/zed.exe" "$RELEASE_DIR/zed-opengl.exe"
-    zip -j "$RELEASE_DIR/zed-opengl.zip" -9 "$RELEASE_DIR/zed-opengl.exe"
+
+    mkdir -p "$ARTIFACTS_DIR/editor-opengl-release/zed/bin"
+    mv "$ARTIFACTS_DIR/editor-opengl-release/zed.exe" "$ARTIFACTS_DIR/editor-opengl-release/zed"
+    cp "$ARTIFACTS_DIR/cli-release/zed.exe" "$ARTIFACTS_DIR/editor-opengl-release/zed/bin"
+
+    cd "$ARTIFACTS_DIR/editor-opengl-release"
+    zip -r "../../$RELEASE_DIR/zed-opengl.zip" -9 "zed/"
+    cd -
 fi
 
 # Generate checksums for existing files in release folder

scripts/test-prepare-release.sh

@@ -20,17 +20,17 @@ setup_test() {
     mkdir -p artifacts
 }
 
-create_dx11_artifact() {
+create_fake_dx11_artifact() {
     mkdir -p artifacts/editor-dx11-release
     echo "fake dx11 executable" > artifacts/editor-dx11-release/zed.exe
 }
 
-create_opengl_artifact() {
+create_fake_opengl_artifact() {
     mkdir -p artifacts/editor-opengl-release
     echo "fake opengl executable" > artifacts/editor-opengl-release/zed.exe
 }
 
-create_cli_artifact() {
+create_fake_cli_artifact() {
     mkdir -p artifacts/cli-release
     echo "fake cli executable" > artifacts/cli-release/cli.exe
 }
@@ -74,48 +74,35 @@ run_test() {
     fi
 }
 
-# Test 1: All three builds exist (CLI + DX11 + OpenGL)
+# Test 1: All three builds exist (DX11 + OpenGL)
 setup_test "All three builds exist"
-create_cli_artifact
-create_dx11_artifact
-create_opengl_artifact
+create_fake_cli_artifact
+create_fake_dx11_artifact
+create_fake_opengl_artifact
 run_test "success"
-verify_file_count 7  # cli.exe, cli.zip, zed.exe, zed.zip, zed-opengl.exe, zed-opengl.zip, sha256sums.txt
-verify_file_exists "release/cli.exe"
-verify_file_exists "release/cli.zip"
-verify_file_exists "release/zed.exe"
+verify_file_count 3
 verify_file_exists "release/zed.zip"
-verify_file_exists "release/zed-opengl.exe"
 verify_file_exists "release/zed-opengl.zip"
 verify_file_exists "release/sha256sums.txt"
 
 # Test 2: Only DX11 build exists
 setup_test "Only DX11 build exists"
-create_dx11_artifact
+create_fake_cli_artifact
+create_fake_dx11_artifact
 run_test "success"
-verify_file_count 3  # zed.exe, zed.zip, sha256sums.txt
-verify_file_exists "release/zed.exe"
+verify_file_count 2
 verify_file_exists "release/zed.zip"
 verify_file_exists "release/sha256sums.txt"
 
 # Test 3: Only OpenGL build exists
 setup_test "Only OpenGL build exists"
-create_opengl_artifact
+create_fake_cli_artifact
+create_fake_opengl_artifact
 run_test "success"
-verify_file_count 3  # zed-opengl.exe, zed-opengl.zip, sha256sums.txt
-verify_file_exists "release/zed-opengl.exe"
+verify_file_count 2
 verify_file_exists "release/zed-opengl.zip"
 verify_file_exists "release/sha256sums.txt"
 
-# Test 3.5: Only CLI build exists
-setup_test "Only CLI build exists"
-create_cli_artifact
-run_test "success"
-verify_file_count 3  # cli.exe, cli.zip, sha256sums.txt
-verify_file_exists "release/cli.exe"
-verify_file_exists "release/cli.zip"
-verify_file_exists "release/sha256sums.txt"
-
 # Test 4: No builds exist
 setup_test "No builds exist"
 run_test "failure"
@@ -129,9 +116,9 @@ echo "✅ No release files created when no builds exist"
 
 # Test 5: Verify checksums are correct
 setup_test "Checksum verification"
-create_cli_artifact
-create_dx11_artifact
-create_opengl_artifact
+create_fake_cli_artifact
+create_fake_dx11_artifact
+create_fake_opengl_artifact
 run_test "success"
 
 # Verify checksums
@@ -144,16 +131,35 @@ else
 fi
 cd ..
 
-# Test 6: Verify zip files contain executables
-setup_test "Zip file content verification"
-create_dx11_artifact
-run_test "success"
+# Check GUI editor in `zed.zip`
+echo "Checking `zed.zip` structure"
+if unzip -l release/zed.zip | grep -q "^.*zed/zed.exe$" ;then
+    echo "✅ GUI editor is in the correct location"
+else
+    echo "❌ GUI editor missing or in wrong location"
+    exit 1
+fi
+# Check CLI launcher in `zed.zip`
+if unzip -l release/zed.zip | grep -q "^.*zed/bin/zed.exe$"; then
+    echo "✅ CLI launcher is in the correct location"
+else
+    echo "❌ CLI launcher missing or in wrong location"
+    exit 1
+fi
 
-# Check zip content
-if unzip -l release/zed.zip | grep -q "zed.exe"; then
-    echo "✅ Zip file contains executable"
+# Check GUI editor in `zed-opengl.zip`
+echo "Checking `zed-opengl.zip` structure"
+if unzip -l release/zed-opengl.zip | grep -q "^.*zed/zed.exe$"; then
+    echo "✅ GUI editor is in the correct location"
+else
+    echo "❌ GUI editor missing or in wrong location"
+    exit 1
+fi
+# Check CLI launcher in `zed-opengl.zip`
+if unzip -l release/zed-opengl.zip | grep -q "^.*zed/bin/zed.exe$"; then
+    echo "✅ CLI launcher is in the correct location"
 else
-    echo "❌ FAIL: Zip file does not contain executable"
+    echo "❌ CLI launcher missing or in wrong location"
     exit 1
 fi