wat

extra path
look at env
2026-09-07 06:07:19 +08:00 · 2021-03-09 23:22:30 +09:00 · 2021-03-09 23:18:16 +09:00 · 2021-03-09 22:43:32 +09:00 · 2021-03-09 22:42:36 +09:00 · 2021-03-07 08:23:48 +02:00
8 changed files with 167 additions and 175 deletions
@@ -6,6 +6,7 @@ on:
    branches:
      - master
      - release/*
+      - wip/bash
  schedule:
    - cron: '0 6 * * *'

@@ -13,11 +14,9 @@ jobs:
  test:
    name: default
    runs-on: windows-latest
-    strategy:
-      fail-fast: false
    steps:
      - name: Check out source code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
      - name: Download Internet
        run: npm install
      - name: Enable Developer Command Prompt
@@ -27,11 +26,39 @@ jobs:
        run: |
          cl.exe hello.c
          hello.exe
+      - name: Extra path
+        shell: bash
+        run: echo "C:\\foo" >> $GITHUB_PATH
+      - name: Check out bash env
+        shell: bash
+        run: |
+          env
+          which link || :
+          which cl   || :
  audit:
    name: npm audit
+    if: false
    runs-on: windows-latest
    steps:
      - name: Check out source code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
      - run: npm install
      - run: npm audit --audit-level=moderate
+  alias-arch:
+    name: arch aliases
+    if: false
+    runs-on: windows-latest
+    steps:
+      - name: Check out source code
+        uses: actions/checkout@v2
+      - name: Download Internet
+        run: npm install
+      - name: Enable Developer Command Prompt
+        uses: ./
+        with:
+          arch: Win32
+      - name: Compile and run some C code
+        shell: cmd
+        run: |
+          cl.exe hello.c
+          hello.exe
@@ -11,13 +11,11 @@ jobs:
  test:
    name: release
    runs-on: windows-latest
-    strategy:
-      fail-fast: false
    steps:
      - name: Setup Developer Command Prompt
        uses: ilammy/msvc-dev-cmd@v1
      - name: Check out source code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
      - name: Compile and run some C code
        shell: cmd
        run: |
@@ -28,5 +26,5 @@ jobs:
    runs-on: windows-latest
    steps:
      - name: Check out source code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
      - run: npm audit --audit-level=moderate
@@ -0,0 +1 @@
+node_modules
@@ -11,7 +11,9 @@ Supports Windows. Does nothing on Linux and macOS.
 ## Inputs

 - `arch` – target architecture
-  - native compilation: `x86`, `x64` (default), `amd64` (synonym for x64)
+  - 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`
 - `sdk` – Windows SDK to use
@@ -1,16 +1,21 @@
 const core = require('@actions/core')
 const child_process = require('child_process')
-const exec = require('util').promisify(child_process.exec)
 const fs = require('fs')
+const path = require('path')
 const process = require('process')

+const PROGRAM_FILES_X86 = process.env['ProgramFiles(x86)']
+
 const EDITIONS = ['Enterprise', 'Professional', 'Community']
 const VERSIONS = ['2019', '2017']

+const VSWHERE_PATH = `${PROGRAM_FILES_X86}\\Microsoft Visual Studio\\Installer`
+
 const InterestingVariables = [
    'INCLUDE',
    'LIB',
    'LIBPATH',
+    'VCINSTALLDIR',
    'Path',
    'Platform',
    'VisualStudioVersion',
@@ -24,7 +29,7 @@ function findWithVswhere(pattern) {
        let installationPath = child_process.execSync(`vswhere -products * -latest -prerelease -property installationPath`).toString().trim()
        return installationPath + '\\' + pattern
    } catch (e) {
-        core.warn(`vswhere failed: ${e}`)
+        core.warning(`vswhere failed: ${e}`)
    }
    return null
 }
@@ -33,45 +38,62 @@ function findVcvarsall() {
    // If vswhere is available, ask it about the location of the latest Visual Studio.
    let path = findWithVswhere('VC\\Auxiliary\\Build\\vcvarsall.bat')
    if (path && fs.existsSync(path)) {
-        core.debug(`found with vswhere: ${path}`)
+        core.info(`Found with vswhere: ${path}`)
        return path
    }
+    core.info("Not found with vswhere")

    // If that does not work, try the standard installation locations,
    // starting with the latest and moving to the oldest.
-    const programFiles = process.env['ProgramFiles(x86)']
    for (const ver of VERSIONS) {
        for (const ed of EDITIONS) {
-            path = `${programFiles}\\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.debug(`found standard location: ${path}`)
+                core.info(`Found standard location: ${path}`)
                return path
            }
        }
    }
+    core.info("Not found in standard locations")

    // Special case for Visual Studio 2015 (and maybe earlier), try it out too.
-    path = `${programFiles}\\Microsoft Visual C++ Build Tools\\vcbuildtools.bat`
+    path = `${PROGRAM_FILES_X86}\\Microsoft Visual C++ Build Tools\\vcbuildtools.bat`
    if (fs.existsSync(path)) {
-        core.debug(`found VS 2015: ${path}`)
+        core.info(`Found VS 2015: ${path}`)
        return path
    }
+    core.info(`Not found in VS 2015 location: ${path}`)

    throw new Error('Microsoft Visual Studio not found')
 }

-async function main() {
+function main() {
    if (process.platform != 'win32') {
        core.info('This is not a Windows virtual environment, bye!')
        return
    }

-    const arch    = core.getInput('arch')
+    // 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",
+    }
+    // Ignore case when matching as that's what humans expect.
+    if (arch.toLowerCase() in arch_aliases) {
+        arch = arch_aliases[arch.toLowerCase()]
+    }
+
    // Due to the way Microsoft Visual C++ is configured, we have to resort to the following hack:
    // Call the configuration batch file and then output *all* the environment variables.

@@ -91,8 +113,25 @@ async function main() {

    const command = `"${findVcvarsall()}" ${args.join(' ')} && set`
    core.debug(`Running: ${command}`)
-    const { stdout } = await exec(command, {shell: "cmd"})
-    const environment = stdout.split('\r\n')
+    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.
+    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:$/)) {
+                continue
+            }
+            core.error(line)
+        }
+    }
+    if (failed) {
+        throw new Error('invalid parameters')
+    }

    for (let string of environment) {
        const [name, value] = string.split('=')
@@ -107,4 +146,9 @@ async function main() {
    core.info(`Configured Developer Command Prompt`)
 }

-main().catch((e) => core.setFailed('Could not setup Developer Command Prompt: ' + e.message))
+try {
+    main()
+}
+catch (e) {
+    core.setFailed('Could not setup Developer Command Prompt: ' + e.message)
+}
@@ -2,7 +2,7 @@
  "_args": [
    [
      "@actions/core@1.2.6",
-      "/home/ilammy/Documents/dev/ilammy/msvc-dev-cmd"
+      "/Users/ilammy/Documents/dev/ilammy/msvc-dev-cmd"
    ]
  ],
  "_from": "@actions/core@1.2.6",
@@ -27,7 +27,7 @@
  ],
  "_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
  "_spec": "1.2.6",
-  "_where": "/home/ilammy/Documents/dev/ilammy/msvc-dev-cmd",
+  "_where": "/Users/ilammy/Documents/dev/ilammy/msvc-dev-cmd",
  "bugs": {
    "url": "https://github.com/actions/toolkit/issues"
  },
@@ -1,6 +1,6 @@
 {
  "name": "msvc-dev-cmd",
-  "version": "1.3.0",
+  "version": "1.1.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -18,29 +18,17 @@
        "@babel/highlight": "^7.8.3"
      }
    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
-      "dev": true
-    },
    "@babel/highlight": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+      "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
      "dev": true,
      "requires": {
-        "@babel/helper-validator-identifier": "^7.9.0",
        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
        "js-tokens": "^4.0.0"
      }
    },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
    "acorn": {
      "version": "7.1.1",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
@@ -48,15 +36,15 @@
      "dev": true
    },
    "acorn-jsx": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
+      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
      "dev": true
    },
    "ajv": {
-      "version": "6.12.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-      "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
+      "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
      "dev": true,
      "requires": {
        "fast-deep-equal": "^3.1.1",
@@ -66,20 +54,12 @@
      }
    },
    "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
+      "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==",
      "dev": true,
      "requires": {
-        "type-fest": "^0.11.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
-        }
+        "type-fest": "^0.8.1"
      }
    },
    "ansi-regex": {
@@ -161,9 +141,9 @@
      }
    },
    "cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
      "dev": true
    },
    "color-convert": {
@@ -315,13 +295,13 @@
      "dev": true
    },
    "espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz",
+      "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==",
      "dev": true,
      "requires": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
+        "acorn": "^7.1.0",
+        "acorn-jsx": "^5.1.0",
        "eslint-visitor-keys": "^1.1.0"
      }
    },
@@ -332,20 +312,12 @@
      "dev": true
    },
    "esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
      "dev": true,
      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
-          "dev": true
-        }
+        "estraverse": "^4.0.0"
      }
    },
    "esrecurse": {
@@ -399,9 +371,9 @@
      "dev": true
    },
    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz",
+      "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==",
      "dev": true,
      "requires": {
        "escape-string-regexp": "^1.0.5"
@@ -428,9 +400,9 @@
      }
    },
    "flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
      "dev": true
    },
    "fs.realpath": {
@@ -460,18 +432,18 @@
      }
    },
    "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+      "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
      "dev": true,
      "requires": {
        "is-glob": "^4.0.1"
      }
    },
    "globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
+      "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
      "dev": true,
      "requires": {
        "type-fest": "^0.8.1"
@@ -531,85 +503,24 @@
      "dev": true
    },
    "inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
+      "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
      "dev": true,
      "requires": {
        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
+        "chalk": "^2.4.2",
        "cli-cursor": "^3.1.0",
        "cli-width": "^2.0.0",
        "external-editor": "^3.0.3",
        "figures": "^3.0.0",
        "lodash": "^4.17.15",
        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
+        "run-async": "^2.2.0",
        "rxjs": "^6.5.3",
        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^5.1.0",
        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
      }
    },
    "is-extglob": {
@@ -633,6 +544,12 @@
        "is-extglob": "^2.1.1"
      }
    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
    "isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -846,15 +763,18 @@
      }
    },
    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
    },
    "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+      "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
      "dev": true,
      "requires": {
        "tslib": "^1.9.0"
@@ -888,9 +808,9 @@
      "dev": true
    },
    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
      "dev": true
    },
    "slice-ansi": {
@@ -958,9 +878,9 @@
      }
    },
    "strip-json-comments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
-      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
      "dev": true
    },
    "supports-color": {
@@ -1031,9 +951,9 @@
      }
    },
    "tslib": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
      "dev": true
    },
    "type-check": {
@@ -1,6 +1,6 @@
 {
  "name": "msvc-dev-cmd",
-  "version": "1.3.0",
+  "version": "1.1.1",
  "description": "GitHub Action to setup Developer Command Prompt for Microsoft Visual C++",
  "main": "index.js",
  "scripts": {
Author	SHA1	Message	Date
Alexei Lozovsky	5c9e3ff532	wat	2021-03-09 23:22:30 +09:00
Alexei Lozovsky	78b8d0d58b	extra path	2021-03-09 23:18:16 +09:00
Alexei Lozovsky	34741d07c4	look at env	2021-03-09 22:43:32 +09:00
Alexei Lozovsky	dd06567c9a	prep	2021-03-09 22:42:36 +09:00
Alexei Lozovsky	6f493f9a67	Architecture aliases: Win32 & Win64 (#29 ) By a public request, let's support aliases for architecture parameters. Treat "arch: Win32" as "x86" and "Win64" as "x64". Test this on CI just in case x86 breaks or something.	2021-03-07 08:23:48 +02:00
Alexei Lozovsky	754fb4dc40	Detect and report vcvarsall.bat errors (#28 ) If the parameters passed to the script are incorrect -- for example, architecture is set to something the script does not understand -- then the script will print an error message and exit successfully without doing anything useful. Detect the error messages, forward them to the user, and fail the action. Hopefully, the information from the script will be enough to pinpoint the source of the issue. For example, if the action is run with: arch: Win32 then the output will be Found with vswhere: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat Error: [ERROR:vcvarsall.bat] Invalid argument found : Win32 Error: Could not setup Developer Command Prompt: invalid parameters which is close enough.	2021-03-07 08:16:28 +02:00
Ewout ter Hoeven	aa2e60900e	CI: Cleanup, checkout v2 (#24 ) - Remove the fail-fast: tag, it's non-functional since a matrix isn't used anymore - Update to the faster checkout v2	2021-02-01 14:01:31 +02:00
Alexei Lozovsky	87f7e3e8ba	Async cleanup and improved logging (#21 ) * Avoid unnecessary async-await Since this is basically a linear script, we don't really need all this async fluff, despite Node.js having a predisposition for async calls. For one, it does not make much sense to immediately await an async call. There is a synchronous version of exec -- execSync -- for that. Suggested-by: Amin Yahyaabadi <aminyahyaabadi74@gmail.com> * Make logging more verbose Provide more insight in what paths are tried and where we have found Visual Studio. Use info level so that it's visible without Actions debugging being enabled. That way the users get to see a bit more of the decision making process.	2020-12-13 08:03:03 +02:00
Alexei Lozovsky	d9df5e2567	Add default vswhere location to PATH (#20 ) Instead of checking "vswhere" in PATH and then in the default location explicitly, just add the default locatio to PATH. That makes a single attempt sufficient.	2020-12-13 07:49:04 +02:00
Alexei Lozovsky	ccb28adcc4	Add node_modules on master with up-to-date deps GitHub Actions tutorials suggest that you should not commit Node.js crap onto your master branch, but it's not like this action has a lot of dependencies, and not being able to test "ilammy/msvc-dev-cmd@master" is so annoying... Therefore, do npm install --only production and commit the results.	2020-12-11 20:05:07 +09:00
Serge Camille	3c1ec87255	Add VCINSTALLDIR to list of exported variables (#23 ) This should allow windeployqt to pick up the exported environment variable.	2020-12-11 14:27:22 +09:00
Nicolas Jarnoux	75fbadd7d3	Check default vswhere location too (#19 ) On some self-hosted runners "vswhere" is not available in the PATH. Add another check in the findWithVswhere() function. It checks the default installation of vswhere as stated by Microsoft, just in case it is there but just not in the PATH. Furthermore, the check refers to non-existent method core.warn() instead of core.warning(). Use the correct method for reporting.	2020-10-18 13:38:45 +03:00