Skip to content

Commit 601e9dc

Browse files
committed
python: use an extra parameter to install Python from the official download link
Signed-off-by: Adrian Vladu <avladu@cloudbasesolutions.com>
1 parent dd05777 commit 601e9dc

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

.github/workflows/build_test_cbsinit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
-VSRedistDir "''" ^
3131
-CloudbaseInitRepoUrl ${{ matrix.cbsinit_repo }} ^
3232
-CloudbaseInitRepoBranch ${{ matrix.cbsinit_branch }} ^
33-
-PythonMsiChecksum "C10234D0D9BD89F6F6DD55BAE28EDE0F97EE0DF4"
33+
-InstallOfficialPythonMsi:$true ^
34+
-OfficialPythonMsiChecksum "C10234D0D9BD89F6F6DD55BAE28EDE0F97EE0DF4"
3435
- uses: actions/upload-artifact@v7
3536
with:
3637
name: "CloudbaseInit_${{ matrix.platform }}_${{ matrix.os }}_MSI_${{ matrix.cbsinit_branch }}"

BuildAutomation/BuildCloudbaseInitSetup.ps1

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ Param(
1010
[switch]$ClonePullInstallerRepo = $true,
1111
[string]$VSRedistDir = "${ENV:ProgramFiles(x86)}\Common Files\Merge Modules",
1212
[string]$SignTimestampUrl = "http://timestamp.digicert.com?alg=sha256",
13-
[string]$VCVars="2019",
14-
[string]$PythonMsiChecksum = $null
13+
[string]$VCVars = "2019",
14+
[switch]$InstallOfficialPythonMsi = $false,
15+
[string]$OfficialPythonMsiChecksum = "C10234D0D9BD89F6F6DD55BAE28EDE0F97EE0DF4"
1516
)
1617

1718
$ErrorActionPreference = "Stop"
@@ -78,9 +79,12 @@ try
7879

7980
$python_template_dir = join-path $cloudbaseInitInstallerDir "Python$($pythonversion.replace('.', ''))_${platform}_Template"
8081

81-
if ($PythonMsiChecksum) {
82+
if ($InstallOfficialPythonMsi) {
83+
if (!$OfficialPythonMsiChecksum) {
84+
throw "Please set a OfficialPythonMsiChecksum parameter value."
85+
}
8286
Remove-Item -Recurse -Force $python_template_dir -ErrorAction SilentlyContinue
83-
DownloadInstall-PythonMsi $platform $python_template_dir $pythonversion $PythonMsiChecksum
87+
DownloadInstall-PythonMsi $platform $python_template_dir $pythonversion $OfficialPythonMsiChecksum
8488
}
8589

8690
CheckCopyDir $python_template_dir $python_dir

0 commit comments

Comments
 (0)