wat

.github/workflows/main.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - release/*
+      - wip/bash
   schedule:
     - cron: '0 6 * * *'
 
@@ -18,55 +19,34 @@ jobs:
         uses: actions/checkout@v2
       - name: Download Internet
         run: npm install
-      - name: Run eslint
-        run: npm run lint
-      - name: Enable Developer Command Prompt (amd64)
+      - name: Enable Developer Command Prompt
         uses: ./
-        with:
-          arch: amd64
-      - name: Compile and run some C code (amd64)
+      - name: Compile and run some C code
         shell: cmd
         run: |
           cl.exe hello.c
           hello.exe
-      - name: Enable Developer Command Prompt (amd64_x86)
-        uses: ./
-        with:
-          arch: amd64_x86
-      - name: Compile and run some C code (x86)
-        shell: cmd
+      - name: Extra path
+        shell: bash
+        run: echo "C:\\foo" >> $GITHUB_PATH
+      - name: Check out bash env
+        shell: bash
         run: |
-          cl.exe hello.c
-          hello.exe
-      - name: Enable Developer Command Prompt (amd64_arm)
-        uses: ./
-        with:
-          arch: amd64_arm
-      - name: Compile some C code (arm)
-        shell: cmd
-        run: |
-          cl.exe hello.c
-          dumpbin /headers hello.exe
-      - name: Enable Developer Command Prompt (amd64_arm64)
-        uses: ./
-        with:
-          arch: amd64_arm64
-      - name: Compile some C code (arm64)
-        shell: cmd
-        run: |
-          cl.exe hello.c
-          dumpbin /headers hello.exe
+          env
+          which link || :
+          which cl   || :
   audit:
     name: npm audit
-    runs-on: ubuntu-latest
+    if: false
+    runs-on: windows-latest
     steps:
       - name: Check out source code
         uses: actions/checkout@v2
       - run: npm install
-      - run: npm audit --audit-level=moderate --production
-      - run: npm audit --audit-level=critical
+      - run: npm audit --audit-level=moderate
   alias-arch:
     name: arch aliases
+    if: false
     runs-on: windows-latest
     steps:
       - name: Check out source code

.github/workflows/release.yml

@@ -23,9 +23,8 @@ jobs:
           hello.exe
   audit:
     name: npm audit
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
       - name: Check out source code
         uses: actions/checkout@v2
-      - run: npm audit --audit-level=moderate --production
-      - run: npm audit --audit-level=critical
+      - run: npm audit --audit-level=moderate

.gitignore

@@ -0,0 +1 @@
+node_modules

README.md

@@ -8,57 +8,14 @@ This sets up the environment for compiling C/C++ code from command line.
 
 Supports Windows. Does nothing on Linux and macOS.
 
-## Example usage
-
-Basic usage for default compilation settings is like this:
-
-```yaml
-jobs:
-  test:
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ilammy/msvc-dev-cmd@v1
-      - name: Build something requiring CL.EXE
-        run: |
-          cmake -G "NMake Makefiles" .
-          nmake
-      # ...
-```
-
-If you want something non-default,
-like using a specific version of Visual Studio,
-or cross-compling for a differen target,
-you will need to configure those settings via inputs:
-
-```yaml
-jobs:
-  test:
-    # Run a job for each of the specified target architectures:
-    strategy:
-      matrix:
-        arch:
-          - amd64
-          - amd64_x86
-          - amd64_arm64
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: ${{ matrix.arch }}
-      - name: Build something requiring CL.EXE
-        run: |
-          cmake -G "NMake Makefiles" .
-          nmake
-      # ...
-```
-
 ## Inputs
 
 - `arch` – target architecture
   - native compilation:
-    - `x64` (default) or its synonyms: `amd64`, `win64`, `x86_64`, `x86-64`
+    - `x64` (default) or its synonyms: `amd64`, `win64`
     - `x86` or its synonyms: `win32`
-  - cross-compilation: `x86_amd64`, `x86_arm`, `x86_arm64`, `amd64_x86`, `amd64_arm`, `amd64_arm64`
+  - cross-compilation: `x86_amd64`, `x86_arm`, `x86_arm64`,
+  	`amd64_x86`, `amd64_arm`, `amd64_arm64`
 - `sdk` – Windows SDK to use
   - do not specify to use the default SDK
   - or specify full Windows 10 SDK number (e.g, `10.0.10240.0`)
@@ -71,64 +28,20 @@ jobs:
 - `uwp` – set `true` to build for Universal Windows Platform (i.e., for Windows Store)
 - `spectre` – set `true` to use Visual Studio libraries with [Spectre](https://meltdownattack.com) mitigations
 
-## Caveats
-
-### Name conflicts with `shell: bash`
-
-Using `shell: bash` in Actions may shadow some of the paths added by MSVC.
-In particular, `link.exe` (Microsoft C linker) is prone to be shadowed by `/usr/bin/link` (GNU filesystem link tool).
-
-Unfortunately, this happens because GitHub Actions unconditionally *prepend* GNU paths when `shell: bash` is used,
-on top of any paths set by `msvc-dev-cmd`, every time at the start of each new step.
-Hence, there aren't many non-destructive options here.
-
-If you experience compilation errors where `link` complains about unreasonable command-line arguments,
-“extra operand *something-something*” – that's probably it.
-Recommended workaround is to remove `/usr/bin/link` if that interferes with your builds.
-If this is not acceptable, please file an issue, then we'll figure out something better.
-
-### Reconfiguration
-
-You can invoke `ilammy/msvc-dev-cmd` multiple times during your jobs with different inputs
-to reconfigure the environment for building with different settings
-(e.g., to target multiple architectures).
+## Example usage
 
 ```yaml
 jobs:
-  release:
-    steps:
-      # ...
-      - name: Configure build for amd64
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: amd64
-
-      - run: build # (for amd64)
-
-      - name: Configure build for x86
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: amd64_x86
-
-      - run: build # (for x86)
-
-      - name: Configure build for ARM64
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: amd64_arm64
-
-      - run: build # (for ARM64)
-
+  test:
+    - uses: actions/checkout@v1
+    - uses: ilammy/msvc-dev-cmd@v1
+    - name: Build something requiring CL.EXE
+      run: |
+        cmake -G "NMake Makefiles" .
+        nmake
     # ...
 ```
 
-This mostly works but it's not really recommended
-since Developer Command Prompt was not meant for recursive reconfiguration.
-That said, if it does not work for you, please file an issue.
-
-Consider using [`strategy.matrix`](https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix)
-to execute different build configuration in parallel, independent environments.
-
 ## License
 
 MIT, see [LICENSE](LICENSE).

index.js

@@ -5,14 +5,25 @@ const path = require('path')
 const process = require('process')
 
 const PROGRAM_FILES_X86 = process.env['ProgramFiles(x86)']
-const PROGRAM_FILES = [process.env['ProgramFiles(x86)'], process.env['ProgramFiles']]
-
 
 const EDITIONS = ['Enterprise', 'Professional', 'Community']
-const VERSIONS = ['2022', '2019', '2017']
+const VERSIONS = ['2019', '2017']
 
 const VSWHERE_PATH = `${PROGRAM_FILES_X86}\\Microsoft Visual Studio\\Installer`
 
+const InterestingVariables = [
+    'INCLUDE',
+    'LIB',
+    'LIBPATH',
+    'VCINSTALLDIR',
+    'Path',
+    'Platform',
+    'VisualStudioVersion',
+    /^VCTools/,
+    /^VSCMD_/,
+    /^WindowsSDK/i,
+]
+
 function findWithVswhere(pattern) {
     try {
         let installationPath = child_process.execSync(`vswhere -products * -latest -prerelease -property installationPath`).toString().trim()
@@ -34,10 +45,9 @@ function findVcvarsall() {
 
     // If that does not work, try the standard installation locations,
     // starting with the latest and moving to the oldest.
-    for (const prog_files of PROGRAM_FILES) {
     for (const ver of VERSIONS) {
         for (const ed of EDITIONS) {
-                path = `${prog_files}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat`
+            path = `${PROGRAM_FILES_X86}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat`
             core.info(`Trying standard location: ${path}`)
             if (fs.existsSync(path)) {
                 core.info(`Found standard location: ${path}`)
@@ -45,7 +55,6 @@ function findVcvarsall() {
             }
         }
     }
-    }
     core.info("Not found in standard locations")
 
     // Special case for Visual Studio 2015 (and maybe earlier), try it out too.
@@ -59,23 +68,7 @@ function findVcvarsall() {
     throw new Error('Microsoft Visual Studio not found')
 }
 
-function isPathVariable(name) {
-    const pathLikeVariables = ['PATH', 'INCLUDE', 'LIB', 'LIBPATH']
-    return pathLikeVariables.indexOf(name.toUpperCase()) != -1
-}
-
-function filterPathValue(path) {
-    let paths = path.split(';')
-    // Remove duplicates by keeping the first occurance and preserving order.
-    // This keeps path shadowing working as intended.
-    function unique(value, index, self) {
-        return self.indexOf(value) === index
-    }
-    return paths.filter(unique).join(';')
-}
-
-/** See https://github.com/ilammy/msvc-dev-cmd#inputs */
-function setupMSVCDevCmd(arch, sdk, toolset, uwp, spectre) {
+function main() {
     if (process.platform != 'win32') {
         core.info('This is not a Windows virtual environment, bye!')
         return
@@ -84,13 +77,17 @@ function setupMSVCDevCmd(arch, sdk, toolset, uwp, spectre) {
     // Add standard location of "vswhere" to PATH, in case it's not there.
     process.env.PATH += path.delimiter + VSWHERE_PATH
 
+    var   arch    = core.getInput('arch')
+    const sdk     = core.getInput('sdk')
+    const toolset = core.getInput('toolset')
+    const uwp     = core.getInput('uwp')
+    const spectre = core.getInput('spectre')
+
     // There are all sorts of way the architectures are called. In addition to
     // values supported by Microsoft Visual C++, recognize some common aliases.
     let arch_aliases = {
         "win32": "x86",
         "win64": "x64",
-        "x86_64": "x64",
-        "x86-64": "x64",
     }
     // Ignore case when matching as that's what humans expect.
     if (arch.toLowerCase() in arch_aliases) {
@@ -114,79 +111,40 @@ function setupMSVCDevCmd(arch, sdk, toolset, uwp, spectre) {
         args.push('-vcvars_spectre_libs=spectre')
     }
 
-    const vcvars = `"${findVcvarsall()}" ${args.join(' ')}`
-    core.debug(`vcvars command-line: ${vcvars}`)
-
-    const cmd_output_string = child_process.execSync(`set && cls && ${vcvars} && cls && set`, {shell: "cmd"}).toString()
-    const cmd_output_parts = cmd_output_string.split('\f')
-
-    const old_environment = cmd_output_parts[0].split('\r\n')
-    const vcvars_output   = cmd_output_parts[1].split('\r\n')
-    const new_environment = cmd_output_parts[2].split('\r\n')
+    const command = `"${findVcvarsall()}" ${args.join(' ')} && set`
+    core.debug(`Running: ${command}`)
+    const environment = child_process.execSync(command, {shell: "cmd"}).toString().split('\r\n')
 
     // If vsvars.bat is given an incorrect command line, it will print out
     // an error and *still* exit successfully. Parse out errors from output
     // which don't look like environment variables, and fail if appropriate.
-    const error_messages = vcvars_output.filter((line) => {
+    var failed = false
+    for (let line of environment) {
         if (line.match(/^\[ERROR.*\]/)) {
+            failed = true
             // Don't print this particular line which will be confusing in output.
-            if (!line.match(/Error in script usage. The correct usage is:$/)) {
-                return true
+            if (line.match(/Error in script usage. The correct usage is:$/)) {
+                continue
+            }
+            core.error(line)
         }
     }
-        return false
-    })
-    if (error_messages.length > 0) {
-        throw new Error('invalid parameters' + '\r\n' + error_messages.join('\r\n'))
+    if (failed) {
+        throw new Error('invalid parameters')
     }
 
-    // Convert old environment lines into a dictionary for easier lookup.
-    let old_env_vars = {}
-    for (let string of old_environment) {
+    for (let string of environment) {
         const [name, value] = string.split('=')
-        old_env_vars[name] = value
-    }
-
-    // Now look at the new environment and export everything that changed.
-    // These are the variables set by vsvars.bat. Also export everything
-    // that was not there during the first sweep: those are new variables.
-    core.startGroup('Environment variables')
-    for (let string of new_environment) {
-        // vsvars.bat likes to print some fluff at the beginning.
-        // Skip lines that don't look like environment variables.
-        if (!string.includes('=')) {
-            continue;
-        }
-        let [name, new_value] = string.split('=')
-        let old_value = old_env_vars[name]
-        // For new variables "old_value === undefined".
-        if (new_value !== old_value) {
-            core.info(`Setting ${name}`)
-            // Special case for a bunch of PATH-like variables: vcvarsall.bat
-            // just prepends its stuff without checking if its already there.
-            // This makes repeated invocations of this action fail after some
-            // point, when the environment variable overflows. Avoid that.
-            if (isPathVariable(name)) {
-                new_value = filterPathValue(new_value)
-            }
-            core.exportVariable(name, new_value)
+        for (let pattern of InterestingVariables) {
+            if (name.match(pattern)) {
+                core.exportVariable(name, value)
+                break
+            }
         }
     }
-    core.endGroup()
 
     core.info(`Configured Developer Command Prompt`)
 }
-exports.setupMSVCDevCmd = setupMSVCDevCmd
-
-function main() {
-    var   arch    = core.getInput('arch')
-    const sdk     = core.getInput('sdk')
-    const toolset = core.getInput('toolset')
-    const uwp     = core.getInput('uwp')
-    const spectre = core.getInput('spectre')
-
-    setupMSVCDevCmd(arch, sdk, toolset, uwp, spectre)
-}
 
 try {
     main()

node_modules/.package-lock.json

@@ -1,13 +0,0 @@
-{
-  "name": "msvc-dev-cmd",
-  "version": "1.10.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "node_modules/@actions/core": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
-      "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA=="
-    }
-  }
-}

node_modules/@actions/core/package.json

@@ -1,16 +1,40 @@
 {
-  "name": "@actions/core",
-  "version": "1.2.6",
-  "description": "Actions core lib",
-  "keywords": [
-    "github",
-    "actions",
-    "core"
+  "_args": [
+    [
+      "@actions/core@1.2.6",
+      "/Users/ilammy/Documents/dev/ilammy/msvc-dev-cmd"
+    ]
   ],
-  "homepage": "https://github.com/actions/toolkit/tree/main/packages/core",
-  "license": "MIT",
-  "main": "lib/core.js",
-  "types": "lib/core.d.ts",
+  "_from": "@actions/core@1.2.6",
+  "_id": "@actions/core@1.2.6",
+  "_inBundle": false,
+  "_integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==",
+  "_location": "/@actions/core",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "@actions/core@1.2.6",
+    "name": "@actions/core",
+    "escapedName": "@actions%2fcore",
+    "scope": "@actions",
+    "rawSpec": "1.2.6",
+    "saveSpec": null,
+    "fetchSpec": "1.2.6"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
+  "_spec": "1.2.6",
+  "_where": "/Users/ilammy/Documents/dev/ilammy/msvc-dev-cmd",
+  "bugs": {
+    "url": "https://github.com/actions/toolkit/issues"
+  },
+  "description": "Actions core lib",
+  "devDependencies": {
+    "@types/node": "^12.0.2"
+  },
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -19,6 +43,15 @@
     "lib",
     "!.DS_Store"
   ],
+  "homepage": "https://github.com/actions/toolkit/tree/main/packages/core",
+  "keywords": [
+    "github",
+    "actions",
+    "core"
+  ],
+  "license": "MIT",
+  "main": "lib/core.js",
+  "name": "@actions/core",
   "publishConfig": {
     "access": "public"
   },
@@ -32,10 +65,6 @@
     "test": "echo \"Error: run tests from root\" && exit 1",
     "tsc": "tsc"
   },
-  "bugs": {
-    "url": "https://github.com/actions/toolkit/issues"
-  },
-  "devDependencies": {
-    "@types/node": "^12.0.2"
-  }
+  "types": "lib/core.d.ts",
+  "version": "1.2.6"
 }

package.json

@@ -1,10 +1,11 @@
 {
   "name": "msvc-dev-cmd",
-  "version": "1.10.0",
+  "version": "1.1.1",
   "description": "GitHub Action to setup Developer Command Prompt for Microsoft Visual C++",
   "main": "index.js",
   "scripts": {
-    "lint": "eslint index.js"
+    "lint": "eslint index.js",
+    "test": "eslint index.js"
   },
   "repository": {
     "type": "git",
@@ -30,6 +31,6 @@
     "@actions/core": "^1.2"
   },
   "devDependencies": {
-    "eslint": "^7"
+    "eslint": "^6.8.0"
   }
 }