Add x86 MASM support, but x64 still default

Author: dimhotepus

.github/workflows/ci.yaml

@@ -17,18 +17,37 @@ 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: ./
+        with:
+          vs-architecture: ${{matrix.platform}}
       - 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
           }
+          

.gitignore

@@ -0,0 +1,98 @@
+# Dependency directory
+node_modules
+
+# Rest pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# OS metadata
+.DS_Store
+Thumbs.db
+
+# Ignore built ts files
+dist/main.js

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.

action-types.yml

@@ -6,6 +6,12 @@ inputs:
     type: string
   vs-prerelease:
     type: boolean
+  vs-architecture:
+    type: enum
+    name: Architecture
+    allowed-values:
+    - x86
+    - x64
 
 outputs:
   masmPath:

action.yml

@@ -14,9 +14,13 @@ inputs:
   vs-prerelease:
     description: "Enable searching for pre-release versions of Visual Studio/MSBuild"
     required: false
+  vs-architecture:
+    description: "The preferred processor architecture of MASM. Can be either 'x86' or 'x64'. 'x64' is only available from Visual Studio version 17.0 and later."
+    required: false
+    default: "x64"
 outputs:
   masmPath:
-    description: "The resulting location of ml64 for your inputs"
+    description: "The resulting location of ml (x86) or ml64 (x64) for your inputs"
 
 runs:
   using: "node20"