Add x86 MASM support, but x64 still default

Author: dimhotepus

.github/workflows/ci.yaml

@@ -17,18 +17,35 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
+        platform: [x86, x64]
         toolchain:
           - stable
     steps:
       - uses: actions/checkout@v4
-      - uses: microsoft/setup-msbuild@v1.1
+      - uses: microsoft/setup-msbuild@v2
+        with:
+          msbuild-architecture: ${{matrix.platform}}
       - uses: ./
       - name: Check MASM Path
         run: |
-          $ml64Path = Get-Command ml64.exe -ErrorAction SilentlyContinue
-          if ($ml64Path) {
-            Write-Output "ml64.exe found in PATH: $($ml64Path.Source)"
+          if ("${{matrix.platform}}" -eq "x64") {
+            $ml64Path = Get-Command ml64.exe -ErrorAction SilentlyContinue
+            if ($ml64Path) {
+              Write-Output "ml64.exe found in PATH: $($ml64Path.Source)"
+            } else {
+              Write-Error "ml64.exe not found in PATH."
+              exit 1
+            }
+          } elseif ("${{matrix.platform}}" -eq "x86") {
+            $mlPath = Get-Command ml.exe -ErrorAction SilentlyContinue
+            if ($mlPath) {
+              Write-Output "ml.exe found in PATH: $($mlPath.Source)"
+            } else {
+              Write-Error "ml.exe not found in PATH."
+              exit 1
+            }
           } else {
-            Write-Error "ml64.exe not found in PATH."
+            Write-Error "Unknown platform ${{matrix.platform}} to get ml<XXX>.exe in PATH."
             exit 1
           }
+          

README.md

@@ -1,6 +1,6 @@
 # setup-masm [![Build Status](https://github.com/glslang/setup-masm/actions/workflows/ci.yaml/badge.svg)](https://github.com/glslang/setup-masm/actions) [![GitHub release](https://img.shields.io/github/v/release/glslang/setup-masm?logo=github)](https://github.com/marketplace/actions/setup-masm)
 
-A GitHub Action to facilitate configuring MASM (Microsoft Macro Assembler) in the workflow PATH to use x64 assembly in Win32 applications.
+A GitHub Action to facilitate configuring MASM (Microsoft Macro Assembler) in the workflow PATH to use x86 or x64 assembly in Win32 applications.
 
 ## Description
 
@@ -16,8 +16,9 @@ Add the following step to your workflow:
 
 ## Inputs
 
-- `vs-version`: The version of Visual Studio to use. Defaults to 'latest'.
-- `vs-prerelease`: Whether to include prerelease versions of Visual Studio. Defaults to 'false'.
+- `vs-version`: The version of Visual Studio to use. Defaults to `'latest'`.
+- `vs-prerelease`: Whether to include prerelease versions of Visual Studio. Defaults to `'false'`.
+- `vs-architecture`: By default the action will use the x64 architecture for MASM, but it is possible to target the x86 versions instead. Valid input values are `'x64'` and `'x86'`. Note that the success of these will rely on the runner OS. Defaults to `'x64'`. 
 
 ## Outputs
 
@@ -41,11 +42,12 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: microsoft/setup-msbuild@v1.1
-      - uses: glslang/setup-masm@v1
+      - uses: microsoft/setup-msbuild@v2
+      - uses: glslang/setup-masm@v1.1
         with:
           vs-version: '2022'
           vs-prerelease: 'true'
+          vs-architecture: 'x86'
 ```
 
 This example demonstrates how to set up MASM in a Windows-based workflow, ensuring that the necessary tools are available for building and testing your project.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-masm",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "lib/main.js",
   "private": true,
   "description": "Helps set up specific MASM tool into PATH for later usage.",
@@ -20,6 +20,7 @@
     "visual studio",
     "masm",
     "assembler",
+    "x86",
     "x64"
   ],
   "author": "Gonçalo Carvalho",

src/main.ts

@@ -9,6 +9,9 @@ const IS_WINDOWS = process.platform === 'win32'
 const VS_VERSION = core.getInput('vs-version') || 'latest'
 const VSWHERE_PATH = core.getInput('vswhere-path')
 const ALLOW_PRERELEASE = core.getInput('vs-prerelease') || 'false'
+const VS_ARCHITECTURE = core.getInput('vs-architecture') || 'x64'
+
+const VS_SUPPORTED_ARCHITECTURES = new Set(['x64', 'x86'])
 
 // Use let for mutable variables
 let vswhereExec = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest '
@@ -31,6 +34,11 @@ async function run(): Promise<void> {
       return
     }
 
+    if (!VS_SUPPORTED_ARCHITECTURES.has(VS_ARCHITECTURE)) {
+      core.setFailed(`setup-masm can only be run for x86 or x64 target CPU architectures, but got ${VS_ARCHITECTURE}`)
+      return
+    }
+
     // check to see if we are using a specific path for vswhere
     let vswhereToolExe = ''
 
@@ -77,9 +85,10 @@ async function run(): Promise<void> {
               .trim()
           )
 
+          const asmExeName = VS_ARCHITECTURE == 'x64' ? 'ml64.exe' : 'ml.exe'
           const toolPath = path.join(
             installationPath,
-            `VC\\Tools\\MSVC\\${vcToolsVersion}\\bin\\Hostx64\\x64\\ml64.exe`
+            `VC\\Tools\\MSVC\\${vcToolsVersion}\\bin\\Host${VS_ARCHITECTURE}\\${VS_ARCHITECTURE}\\${asmExeName}`
           )
           core.debug(`Checking for path: ${toolPath}`)
           if (fs.existsSync(toolPath)) {