msvc-dev-cmv v1.8.1

Also updating and adding whatever the new version of npm wants to be
updated and added in its package files. This should not affect the
behavior of the action.

.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,42 +6,56 @@ 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]
+    runs-on: windows-latest
     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
+      - name: Run eslint
+        run: npm run lint
+      - name: Enable Developer Command Prompt (amd64)
         uses: ./
-      - name: Compile and run some C code
+        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: 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

.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`
     - `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

@@ -55,6 +55,21 @@ 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(';')
+}
+
 function main() {
     if (process.platform != 'win32') {
         core.info('This is not a Windows virtual environment, bye!')
@@ -101,25 +116,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 +156,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)
         }
     }

node_modules/.package-lock.json

@@ -0,0 +1,13 @@
+{
+  "name": "msvc-dev-cmd",
+  "version": "1.8.1",
+  "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=="
+    }
+  }
+}

package.json

@@ -1,11 +1,10 @@
 {
   "name": "msvc-dev-cmd",
-  "version": "1.1.1",
+  "version": "1.8.1",
   "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",