mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-02 19:19:41 +01:00
Merge bitcoin/bitcoin#34583: ci: [refactor] Drop last use of pwsh
fa36adeb71ci: [refactor] Drop last use of pwsh (MarcoFalke)fae31b1e2fci: [refactor] Move github_import_vs_env to python script (MarcoFalke) Pull request description: The use of pwsh was a bit confusing and inconsistent around the exit code. See also https://github.com/bitcoin/bitcoin/pull/32672 I think it is fine to drop it and purely use Bash/Python. This also moves a bit of code from the github yaml to the python script. ACKs for top commit: m3dwards: Looks good! re-ACKfa36adeb71hodlinator: re-ACKfa36adeb71Tree-SHA512: 78edffc60c58c476b0acca5224150169d154b0b818114844a04295af9ba19b7cdf1fb2afb738f6cafd6172f0f477d546018ebf95061eb5bd8bbb35e065a129d4
This commit is contained in:
27
.github/workflows/ci.yml
vendored
27
.github/workflows/ci.yml
vendored
@@ -238,26 +238,19 @@ jobs:
|
||||
|
||||
- *CHECKOUT
|
||||
|
||||
- &SET_UP_VS
|
||||
name: Set up VS Developer Prompt
|
||||
shell: pwsh -Command "$PSVersionTable; $PSNativeCommandUseErrorActionPreference = $true; $ErrorActionPreference = 'Stop'; & '{0}'"
|
||||
run: |
|
||||
$vswherePath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
|
||||
$installationPath = & $vswherePath -latest -property installationPath
|
||||
& "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x64 -no_logo && set" | foreach-object {
|
||||
$name, $value = $_ -split '=', 2
|
||||
echo "$name=$value" >> $env:GITHUB_ENV
|
||||
}
|
||||
- &IMPORT_VS_ENV
|
||||
name: Import Visual Studio env vars
|
||||
run: py -3 .github/ci-windows.py "standard" github_import_vs_env
|
||||
|
||||
- name: Get tool information
|
||||
shell: pwsh
|
||||
run: |
|
||||
cmake -version | Tee-Object -FilePath "cmake_version"
|
||||
Write-Output "---"
|
||||
msbuild -version | Tee-Object -FilePath "msbuild_version"
|
||||
$env:VCToolsVersion | Tee-Object -FilePath "toolset_version"
|
||||
set -o errexit -o pipefail -o xtrace -o nounset
|
||||
|
||||
cmake -version | tee cmake_version
|
||||
echo '---'
|
||||
msbuild.exe -version | tee msbuild_version
|
||||
echo "${VCToolsVersion-}" | tee toolset_version
|
||||
py -3 --version
|
||||
Write-Host "PowerShell version $($PSVersionTable.PSVersion.ToString())"
|
||||
bash --version
|
||||
|
||||
- name: Using vcpkg with MSBuild
|
||||
@@ -430,7 +423,7 @@ jobs:
|
||||
- name: Run bitcoind.exe
|
||||
run: py -3 .github/ci-windows-cross.py print_version
|
||||
|
||||
- *SET_UP_VS
|
||||
- *IMPORT_VS_ENV
|
||||
|
||||
- name: Check executable manifests
|
||||
run: py -3 .github/ci-windows-cross.py check_manifests
|
||||
|
||||
Reference in New Issue
Block a user