msvc-dev-cmd v1.10.0

* Upgrade "ansi-regex" 5.0.0 => 5.0.1

And various other stuff because npm can't just upgrade one thing in the
lockfile, it need to upgrade everything it can. Move along, nothing
interesting to see here.

* Upgrade "eslint" 6 => 7

And also unpin the minor version. This resolves a bunch of "critical"
audit advisories from transitive dependencies.

.github/workflows/environment.yaml

@@ -1,19 +0,0 @@
-name: z5-build-env
-channels:
-  - conda-forge
-dependencies:
-  - cmake
-  - compilers
-  - bzip2
-  - lz4-c
-  - xz
-  - zlib
-  - boost-cpp>=1.63
-  - xtensor>=0.21,<0.22
-  - xtensor-python>=0.24,<0.25
-  - xsimd
-  - blosc
-  - imageio
-  - nlohmann_json
-  - zarr
-  - h5py

.github/workflows/main.yml

@@ -6,50 +6,65 @@ on:
     branches:
       - master
       - release/*
-      - new-windows
   schedule:
     - cron: '0 6 * * *'
 
 jobs:
   test:
     name: default
-    runs-on: ${{ matrix.windows }}
-    strategy:
-      matrix:
-        windows: [windows-2016, windows-2019]
-    steps:
-      - name: Check out source code
-        uses: actions/checkout@v2
-
-      - name: Setup miniconda
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          activate-environment: z5-build-env
-          auto-update-conda: true
-          channels: conda-forge
-          environment-file: .github/workflows/environment.yaml
-          python-version: 3.7
-          auto-activate-base: false
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-
-      - name: Download Internet
-        run: npm install
-      - name: Enable Developer Command Prompt
-        uses: ./
-      - name: Compile and run some C code
-        shell: cmd
-        run: |
-          cl.exe hello.c
-          hello.exe
-  audit:
-    name: npm audit
     runs-on: windows-latest
+    steps:
+      - name: Check out source code
+        uses: actions/checkout@v2
+      - name: Download Internet
+        run: npm install
+      - name: Run eslint
+        run: npm run lint
+      - name: Enable Developer Command Prompt (amd64)
+        uses: ./
+        with:
+          arch: amd64
+      - name: Compile and run some C code (amd64)
+        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
+        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
+  audit:
+    name: npm audit
+    runs-on: ubuntu-latest
     steps:
       - name: Check out source code
         uses: actions/checkout@v2
       - run: npm install
-      - run: npm audit --audit-level=moderate
+      - run: npm audit --audit-level=moderate --production
+      - run: npm audit --audit-level=critical
   alias-arch:
     name: arch aliases
     runs-on: windows-latest

.github/workflows/release.yml

@@ -10,10 +10,7 @@ on:
 jobs:
   test:
     name: release
-    runs-on: ${{ matrix.windows }}
-    strategy:
-      matrix:
-        windows: [windows-2016, windows-2019]
+    runs-on: windows-latest
     steps:
       - name: Setup Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1
@@ -26,8 +23,9 @@ jobs:
           hello.exe
   audit:
     name: npm audit
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Check out source code
         uses: actions/checkout@v2
-      - run: npm audit --audit-level=moderate
+      - run: npm audit --audit-level=moderate --production
+      - run: npm audit --audit-level=critical

.gitignore

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

README.md

@@ -8,14 +8,57 @@ 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`
+    - `x64` (default) or its synonyms: `amd64`, `win64`, `x86_64`, `x86-64`
     - `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`)
@@ -28,20 +71,6 @@ Supports Windows. Does nothing on Linux and macOS.
 - `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
 
-## Example usage
-
-```yaml
-jobs:
-  test:
-    - uses: actions/checkout@v1
-    - uses: ilammy/msvc-dev-cmd@v1
-    - name: Build something requiring CL.EXE
-      run: |
-        cmake -G "NMake Makefiles" .
-        nmake
-    # ...
-```
-
 ## Caveats
 
 ### Name conflicts with `shell: bash`
@@ -58,6 +87,48 @@ If you experience compilation errors where `link` complains about unreasonable c
 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).
+
+```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)
+
+      # ...
+```
+
+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,9 +5,11 @@ 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 = ['2019', '2017']
+const VERSIONS = ['2022', '2019', '2017']
 
 const VSWHERE_PATH = `${PROGRAM_FILES_X86}\\Microsoft Visual Studio\\Installer`
 
@@ -32,13 +34,15 @@ function findVcvarsall() {
 
     // If that does not work, try the standard installation locations,
     // starting with the latest and moving to the oldest.
-    for (const ver of VERSIONS) {
-        for (const ed of EDITIONS) {
-            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}`)
-                return path
+    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`
+                core.info(`Trying standard location: ${path}`)
+                if (fs.existsSync(path)) {
+                    core.info(`Found standard location: ${path}`)
+                    return path
+                }
             }
         }
     }
@@ -55,7 +59,23 @@ function findVcvarsall() {
     throw new Error('Microsoft Visual Studio not found')
 }
 
-function main() {
+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) {
     if (process.platform != 'win32') {
         core.info('This is not a Windows virtual environment, bye!')
         return
@@ -64,17 +84,13 @@ function main() {
     // 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) {
@@ -101,25 +117,27 @@ function main() {
     const vcvars = `"${findVcvarsall()}" ${args.join(' ')}`
     core.debug(`vcvars command-line: ${vcvars}`)
 
-    const old_environment = child_process.execSync(`set`, {shell: "cmd"}).toString().split('\r\n')
-    const new_environment = child_process.execSync(`${vcvars} && set`, {shell: "cmd"}).toString().split('\r\n')
+    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')
 
     // 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.
-    var failed = false
-    for (let line of new_environment) {
+    const error_messages = vcvars_output.filter((line) => {
         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:$/)) {
-                continue
+            if (!line.match(/Error in script usage. The correct usage is:$/)) {
+                return true
             }
-            core.error(line)
         }
-    }
-    if (failed) {
-        throw new Error('invalid parameters')
+        return false
+    })
+    if (error_messages.length > 0) {
+        throw new Error('invalid parameters' + '\r\n' + error_messages.join('\r\n'))
     }
 
     // Convert old environment lines into a dictionary for easier lookup.
@@ -139,11 +157,18 @@ function main() {
         if (!string.includes('=')) {
             continue;
         }
-        const [name, new_value] = string.split('=')
-        const old_value = old_env_vars[name]
+        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)
         }
     }
@@ -151,6 +176,17 @@ function main() {
 
     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

@@ -0,0 +1,13 @@
+{
+  "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,40 +1,16 @@
 {
-  "_args": [
-    [
-      "@actions/core@1.2.6",
-      "/Users/ilammy/Documents/dev/ilammy/msvc-dev-cmd"
-    ]
-  ],
-  "_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"
-  },
+  "name": "@actions/core",
+  "version": "1.2.6",
   "description": "Actions core lib",
-  "devDependencies": {
-    "@types/node": "^12.0.2"
-  },
+  "keywords": [
+    "github",
+    "actions",
+    "core"
+  ],
+  "homepage": "https://github.com/actions/toolkit/tree/main/packages/core",
+  "license": "MIT",
+  "main": "lib/core.js",
+  "types": "lib/core.d.ts",
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -43,15 +19,6 @@
     "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"
   },
@@ -65,6 +32,10 @@
     "test": "echo \"Error: run tests from root\" && exit 1",
     "tsc": "tsc"
   },
-  "types": "lib/core.d.ts",
-  "version": "1.2.6"
+  "bugs": {
+    "url": "https://github.com/actions/toolkit/issues"
+  },
+  "devDependencies": {
+    "@types/node": "^12.0.2"
+  }
 }

package.json

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