Fallback to WASI on ARM arch to avoid crash. Use improved CI.

Author: antaalt

.github/workflows/build.yml

@@ -41,29 +41,24 @@ jobs:
         run: echo '${{ fromJson(steps.get_package_json.outputs.packageJson).server_version }}'
         env:
           PACKAGE_JSON: echo $PACKAGE_JSON
-      - name: Download windows shader language server.
+      - name: Download shader language servers.
         uses: robinraju/[email protected]
         env:
           PACKAGE_JSON: echo $PACKAGE_JSON
         with:
           repository: 'antaalt/shader-sense'
           tag: ${{ format('v{0}', fromJson(steps.get_package_json.outputs.packageJson).server_version) }}
           fileName: '*.zip'
-          #token: '${{ secrets.GH_PAT }}'
       - name: Create bin folder
         run: mkdir ./bin
       - name: Copy windows binaries to bin
-        run: mkdir ./bin/windows && unzip shader-language-server-windows.zip -d ./bin/windows && rm ./shader-language-server-windows.zip
+        run: mkdir ./bin/windows && unzip shader-language-server-x86_64-pc-windows-msvc.zip -d ./bin/windows && rm ./shader-language-server-x86_64-pc-windows-msvc.zip
       - name: Copy linux binaries to bin
-        run: mkdir ./bin/linux && unzip shader-language-server-linux.zip -d ./bin/linux && rm ./shader-language-server-linux.zip
-      - name: Copy macos binaries to bin
-        run: mkdir ./bin/macos && unzip shader-language-server-macos.zip -d ./bin/macos && rm ./shader-language-server-macos.zip
+        run: mkdir ./bin/linux && unzip shader-language-server-x86_64-unknown-linux-gnu.zip -d ./bin/linux && rm ./shader-language-server-x86_64-unknown-linux-gnu.zip
       - name: Copy wasi binaries to bin
-        run: mkdir ./bin/wasi && unzip shader-language-server-wasi.zip -d ./bin/wasi && rm ./shader-language-server-wasi.zip
+        run: mkdir ./bin/wasi && unzip shader-language-server-wasm32-wasip1-threads.zip -d ./bin/wasi && rm ./shader-language-server-wasm32-wasip1-threads.zip
       - name: Mark server as executable on Linux
         run: chmod +x ./bin/linux/shader-language-server
-      - name: Mark server as executable on MacOS
-        run: chmod +x ./bin/macos/shader-language-server
       - name: Get server version
         run: echo "SERVER_VERSION=$(./bin/linux/shader-language-server --version | sed 's/shader-language-server v//g')" >> $GITHUB_ENV
       # VScode need a framebuffer to run test. So create one.

package.json

@@ -7,8 +7,8 @@
     "color": "#9ad0ff",
     "theme": "light"
   },
-  "version": "0.6.0",
-  "server_version": "0.6.0",
+  "version": "0.6.1",
+  "server_version": "0.6.1",
   "publisher": "antaalt",
   "repository": {
     "type": "git",

src/test/suite/binary.test.ts

@@ -34,10 +34,4 @@ suite('Binary Test Suite', () => {
 		assert.ok(doesBinaryExist("linux/libdxcompiler.so"));
 		assert.ok(doesBinaryExist("linux/libdxil.so"));
 	});
-	test('Check macos binary', () => {
-		assert.ok(doesBinaryExist("macos/shader-language-server"));
-		// Dxc need these dll or it will crash.
-		assert.ok(doesBinaryExist("macos/libdxcompiler.so"));
-		assert.ok(doesBinaryExist("macos/libdxil.so"));
-	});
 });

src/validator.ts

@@ -27,7 +27,6 @@ import { sidebar } from "./extension";
 export enum ServerPlatform {
     windows,
     linux,
-    macOS,
     wasi,
 }
 
@@ -43,8 +42,6 @@ function getPlatformBinaryDirectoryPath(platform: ServerPlatform) : string {
             return "bin/windows/";
         case ServerPlatform.linux:
             return "bin/linux/";
-        case ServerPlatform.macOS:
-            return "bin/macos/";
         case ServerPlatform.wasi:
             return "bin/wasi/";
     }
@@ -55,8 +52,6 @@ function getPlatformBinaryName(platform: ServerPlatform) : string {
             return "shader-language-server.exe";
         case ServerPlatform.linux:
             return "shader-language-server";
-        case ServerPlatform.macOS:
-            return "shader-language-server";
         case ServerPlatform.wasi:
             return "shader-language-server.wasm";
     }
@@ -89,16 +84,14 @@ export function getServerPlatform() : ServerPlatform {
     if (isRunningOnWeb()) {
         return ServerPlatform.wasi;
     } else {
+        // Dxc only built for linux x64 & windows x64. Fallback to WASI for every other situations.
         switch (process.platform) {
             case "win32":
-                return ServerPlatform.windows;
+                return (process.arch === 'x64') ? ServerPlatform.windows : ServerPlatform.wasi;
             case "linux":
-                return ServerPlatform.linux;
-            case "darwin":
-                return ServerPlatform.wasi; // For now, use WASI as I cannot test on MAC.
-                //return ServerPlatform.macOS;
+                return (process.arch === 'x64') ? ServerPlatform.linux : ServerPlatform.wasi;
             default:
-                return ServerPlatform.wasi; // Not supported. Fallback to WASI.
+                return ServerPlatform.wasi;
         }
     }
 }