Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workflows: replace depracted set-env with github envs #2261

Closed
wants to merge 8 commits into from
+9 −4
Closed

workflows: replace depracted set-env with github envs #2261

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
971fccc
workflows: replace depracted set-env with github envs
MadMango Nov 17, 2020
afc2967
Update .github/workflows/tests.yml
MadMango Nov 19, 2020
b8a15a4
trying in powershell specific syntax
MadMango Nov 19, 2020
6b798be
logging overrides
MadMango Nov 30, 2020
9d5f8e6
testing github recommended syntax again
MadMango Nov 30, 2020
984fd3b
trying python syntax
MadMango Nov 30, 2020
c3ec274
forgot to imoprt os
MadMango Nov 30, 2020
6752fcf
Update gyp/pylib/gyp/MSVSVersion.py
MadMango Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ on: [push, pull_request]
jobs:
Tests:
strategy:
fail-fast: false
fail-fast: false
max-parallel: 15
matrix:
node: [10.x, 12.x, 14.x]
@@ -31,9 +31,11 @@ jobs:
pip install flake8 pytest
- name: Set Windows environment
if: matrix.os == 'windows-latest'
run:
echo '::set-env name=GYP_MSVS_VERSION::2015'
echo '::set-env name=GYP_MSVS_OVERRIDE_PATH::C:\\Dummy'
run: |
import os
os.environ["GYP_MSVS_VERSION"] = "2015"
os.environ["GYP_MSVS_OVERRIDE_PATH"] = "C:\\Dummy"
shell: python
- name: Lint Python
if: matrix.os == 'ubuntu-latest'
run: |
3 changes: 3 additions & 0 deletions gyp/pylib/gyp/MSVSVersion.py
View file
Original file line number Diff line number Diff line change
@@ -549,6 +549,9 @@ def SelectVisualStudioVersion(version="auto", allow_fallback=True):
"2017": ("15.0",),
"2019": ("16.0",),
}
print('ENV OVERRIDES: \n')
for key in ("GYP_MSVS_OVERRIDE_PATH", "GYP_MSVS_VERSION"):
print("{}: {}".format(key, os.environ.get(key)))
override_path = os.environ.get("GYP_MSVS_OVERRIDE_PATH")
if override_path:
msvs_version = os.environ.get("GYP_MSVS_VERSION")