build: conditionally clear vcinstalldir #36009
Conversation
nodejs-github-bot
added
build
|
@nodejs/platform-windows |
bingenito
force-pushed
the
ISSUE-35856
branch
from
02c6551
to
4909564
Compare
|
I realized my commit message format was wrong so amended and pushed |
|
@nodejs/build-files |
github-actions
bot
removed
the
request-ci
|
@Trott If this does get merged, is there any guidance or steps I should traverse to get it merged back to 14? |
Should happen by default, I think. The hard part is going to be to find Windows folks who can review it and approve it. /ping @joaocgreis @bzoz |
There was a problem hiding this comment.
As I mentioned in #35856 (comment) I'm unable to validate #30119 still works but it looks like it should.
I'll stick a watch label on it for 14.x anyway. Would still be good to get someone from @nodejs/platform-windows to review. |
@richardlau I should be able to dig up a pc with vs2017 tomorrow and include log snippet to help with evidence to ensure it falls through. |
Just remembered that we dropped VS2017 support in Node.js 15 (#33694) so there's nothing to fall through to on |
|
@richardlau @Trott Without change: With change: |
|
Landed in 4b0308a. Thanks for the contribution! 🎉 |
For scenario where target env is explicitly specified as vs2019, do not clear VCINSTALLDIR which was being cleared to handle fallback to vs2017 block when attempting to find a matching available VS. Fixes: #35856 PR-URL: #36009 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
For scenario where target env is explicitly specified as vs2019, do not clear VCINSTALLDIR which was being cleared to handle fallback to vs2017 block when attempting to find a matching available VS. Fixes: #35856 PR-URL: #36009 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
For scenario where target env is explicitly specified as vs2019, do not clear VCINSTALLDIR which was being cleared to handle fallback to vs2017 block when attempting to find a matching available VS. Fixes: #35856 PR-URL: #36009 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
For scenario where target env is explicitly specified as vs2019, do not clear VCINSTALLDIR which was being cleared to handle fallback to vs2017 block when attempting to find a matching available VS. Fixes: #35856 PR-URL: #36009 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
For scenario where target env is explicitly specified as vs2019, do not clear VCINSTALLDIR which was being cleared to handle fallback to vs2017 block when attempting to find a matching available VS.
Fixes: #35856
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesTHIS SOFTWARE IS CONTRIBUTED SUBJECT TO THE TERMS OF . https://github.com/nodejs/node/blob/master/LICENSE.
THIS SOFTWARE IS LICENSED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY WARRANTY OF NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE MAY BE REDISTRIBUTED TO OTHERS ONLY BY EFFECTIVELY USING THIS OR ANOTHER EQUIVALENT DISCLAIMER IN ADDITION TO ANY OTHER REQUIRED LICENSE TERMS.