Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 5 additions & 8 deletions .github/workflows/build-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,8 @@ jobs:
shell: powershell

- name: Prepare build env on Windows
uses: ilammy/msvc-dev-cmd@v1.12.0
with:
arch: x64
toolset: 14.20
run: |
python3 -u ./SilKit/ci/setup_msvc_env.py --arch x64 --hostarch x64 --vcvars_ver 14.2

- uses: ./.github/actions/build-cmake-preset
with:
Expand Down Expand Up @@ -78,10 +76,9 @@ jobs:
shell: powershell

- name: Prepare build env on Windows
uses: ilammy/msvc-dev-cmd@v1.12.0
with:
arch: x86
toolset: 14.20
run: |
python3 -u ./SilKit/ci/setup_msvc_env.py --arch x86 --hostarch x64 --vcvars_ver 14.2


- uses: ./.github/actions/build-cmake-preset
with:
Expand Down
75 changes: 75 additions & 0 deletions SilKit/ci/setup_msvc_env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#! /bin/env python3

# SPDX-FileCopyrightText: 2025 Vector Informatik GmbH
#
# SPDX-License-Identifier: MIT

import subprocess
import json
import logging
import os
import argparse

logger = logging.getLogger(__name__)
handler = logging.StreamHandler()
logger.addHandler(handler)
logger.setLevel(logging.DEBUG)

from pathlib import Path

def find_VsDevCmd() -> str:

some_out = subprocess.run(
["vswhere", "-latest", "-property", "InstallationPath"],
capture_output=True, encoding="utf-8", check=True)

print(some_out.stdout)


return Path(some_out.stdout.rstrip())

def main():

parser = argparse.ArgumentParser(prog="Microsoft Dev Env Creator",
description="Setup the development environment under Windows")
parser.add_argument('--arch', type=str, default='x64',
help='The architecture for which to build the binary for')
parser.add_argument('--hostarch', type=str, default='x64',
help='The architecture of the host build machine')
parser.add_argument('--vcvars_ver', type=str, default='14.2',
help='The version of the toolset to be used')
args = parser.parse_args()

vs_path = find_VsDevCmd()

vsdevcmd_path = vs_path / r'Common7\Tools\VsDevCmd.bat'
Comment on lines +43 to +45

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
vs_path = find_VsDevCmd()
vsdevcmd_path = vs_path / r'Common7\Tools\VsDevCmd.bat'
vsdevcmd_path = find_VsDevCmd()

vsdevcmd = f'"{vsdevcmd_path}" -arch={args.arch} -host_arch={args.hostarch} -vcvars_ver={args.vcvars_ver}'

logger.debug(f"Executing cmd:\n{vsdevcmd}")

osenvcmd = '( python -c "import os, json; print(json.dumps(dict(os.environ)))" )'
print(f"Found at: {vsdevcmd_path}")
vsdevcmd_proc = subprocess.run(
executable=r'C:\Windows\System32\cmd.exe',
args=f'/S /C "( ( {vsdevcmd} >NUL 2>&1 ) && {osenvcmd} ) & exit"',
capture_output=True, encoding="utf-8", check=False)

new_env = vsdevcmd_proc.stdout
logger.debug(f"New Env:\n{new_env}")
logger.debug(f"Old End: \n{json.dumps(dict(os.environ), indent=2)}")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
logger.debug(f"Old End: \n{json.dumps(dict(os.environ), indent=2)}")
logger.debug(f"Old Env: \n{json.dumps(dict(os.environ), indent=2)}")

if not new_env:
logger.error("Could not acquire a new shell env!")
exit(1)

environment = json.loads(vsdevcmd_proc.stdout)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before 'publishing' the new environment to GITHUB_ENV, we should filter out any environment variable starting with GITHUB_, RUNNER_, and the CI variable.


with open(os.environ['GITHUB_ENV'], 'a') as f:
for k, v in environment.items():
logger.debug(f"updating environment variable {k!r} = {v!r}")
os.environ[k] = v
f.write(f"{k}={v}\n")



if __name__ == "__main__":
main()
Loading