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

Fix powershell7.4 issue #274

Merged
merged 3 commits into from
Feb 13, 2024
Merged

Fix powershell7.4 issue #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ae117d
set psmodulepath to fix the pwsh7.4 issue
xiazhvera Feb 12, 2024
a46e61b
enable win cert store test
xiazhvera Feb 12, 2024
b064aa9
update comments
xiazhvera Feb 12, 2024
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
5 changes: 2 additions & 3 deletions builder/actions/setup_cross_ci_crt_environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
environment variables, secrets, files, etc. that is used to build up the testing environment.
"""

# TODO: The variable is used to disable the windows certificate store test to unblock a CI failure.
# The variable should be set to TRUE after the CI is fixed.
ENABLE_WINDOWS_CERT_STORE_TEST = False
# Enable windows certificate store test
ENABLE_WINDOWS_CERT_STORE_TEST = True


class SetupCrossCICrtEnvironment(Action):
Expand Down
4 changes: 4 additions & 0 deletions builder/actions/setup_cross_ci_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ def create_windows_cert_store(env, certificate_env, location_env):
# Import the PFX into the Windows Certificate Store
# (Passing '$mypwd' is required even though it is empty and our certificate has no password. It fails CI otherwise)
import_pfx_arguments = [
# Powershell 7.3 introduced an issue where launching powershell from cmd would not set PSModulePath correctly.
# As a workaround, we set `PSModulePath` to empty so powershell would automatically reset the PSModulePath to default.
# More details: https://github.com/PowerShell/PowerShell/issues/18530
"$env:PSModulePath = '';",
"Import-PfxCertificate",
"-FilePath", pfx_cert_path,
"-CertStoreLocation", windows_certificate_folder]
Expand Down
Loading