Skip to content

Commit 3b0febe

Browse files
committed
fix: Build workflow fixes
1 parent cf07c61 commit 3b0febe

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

.github/workflows/build-installer.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@ jobs:
3636
build-installer-online:
3737
name: Build Online Installer
3838
if: inputs.installer_type == 'online'
39-
uses: espressif/idf-installer/.github/workflows/build-online-installer.yml
39+
uses: espressif/idf-installer/.github/workflows/build-online-installer.yml@main
4040
with:
4141
online_installer_version: ${{ inputs.online_installer_version }}
4242
secrets: inherit
4343

4444
build-installer-offline:
4545
name: Build Offline Installer
4646
if: inputs.installer_type == 'offline'
47-
uses: espressif/idf-installer/.github/workflows/build-offline-installer.yml
47+
uses: espressif/idf-installer/.github/workflows/build-offline-installer.yml@fix/installer_builds
4848
with:
49-
esp_idf_version: ${{ inputs.esp_idf_version}}
49+
esp_idf_version: ${{ inputs.esp_idf_version }}
5050
secrets: inherit
5151

5252
build-installer-ide:
5353
name: Build IDE Installer
5454
if: inputs.installer_type == 'espressif-ide'
55-
uses: espressif/idf-installer/.github/workflows/build-espressif-ide-installer.yml
55+
uses: espressif/idf-installer/.github/workflows/build-espressif-ide-installer.yml@main
5656
with:
5757
esp_idf_version: ${{ inputs.esp_idf_version }}
5858
espressif_ide_version: ${{ inputs.espressif_ide_version }}
@@ -61,7 +61,7 @@ jobs:
6161
update-docs-files:
6262
needs: [build-installer-online, build-installer-offline, build-installer-ide]
6363
name: Create ${{ github.env.INSTALLER_TYPE }} installer release PR
64-
if: ${{ always() }} && (${{ needs.build-installer-ide.result }} == 'success' || ${{ needs.build-installer-offline.result }} == 'success' || ${{ needs.build-installer-online.result }} == 'success')
64+
if: ${{ always() && (needs.build-installer-ide.result == 'success' || needs.build-installer-offline.result == 'success' || needs.build-installer-online.result == 'success') }}
6565
runs-on: windows-latest
6666
strategy:
6767
fail-fast: false
@@ -85,7 +85,7 @@ jobs:
8585

8686
- name: Get size of online installer and Update docs files
8787
run: |
88-
echo "Instaler size from variable is $(Get-Content variables.txt)"
88+
echo "Installer size from variable is $(Get-Content variables.txt)"
8989
9090
$size_bytes = [int]$(Get-Content variables.txt)
9191
# Check if the content is larger than 100000

.github/workflows/build-offline-installer.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
build-offline-installer:
1616
name: Build Installer
17-
runs-on: windows-latest
17+
runs-on: windows-2022
1818
steps:
1919
- name: Checkout repository
2020
uses: actions/checkout@v5
@@ -24,11 +24,20 @@ jobs:
2424
with:
2525
python-version: '3.11'
2626

27+
- name: Install Inno Setup
28+
shell: pwsh
29+
run: choco install innosetup inno-download-plugin
30+
2731
- name: Install Inno Setup Download plugin
2832
shell: pwsh
2933
run: |
30-
Write-Output $(pwd)
31-
Invoke-WebRequest -Uri https://github.com/espressif/inno-download-plugin/releases/download/v1.5.1/idpsetup-1.5.1.exe -OutFile idpsetup.exe; .\idpsetup.exe /SILENT
34+
$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
35+
Write-Output "Running as Administrator: $isAdmin"
36+
Write-Output "Downloading Inno Download Plugin..."
37+
Invoke-WebRequest -Uri https://github.com/espressif/inno-download-plugin/releases/download/v1.5.1/idpsetup-1.5.1.exe -OutFile idpsetup.exe
38+
Write-Output "Installing Inno Download Plugin..."
39+
.\idpsetup.exe /SP- /SUPPRESSMSGBOXES
40+
Write-Output "Installation completed."
3241
3342
- name: Build Installer
3443
env:

Build-Installer.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,7 @@ function PrepareIdfPythonWheels {
268268

269269
$ConstraintFile = GetConstraintFile
270270

271-
&$Python -m pip download --python-version $IdfPythonShortVersion `
272-
--only-binary=":all:" `
271+
&$Python -m pip download `
273272
--extra-index-url "https://dl.espressif.com/pypi/" `
274273
-r ${Requirements} `
275274
-d ${WheelsDirectory} `
@@ -382,6 +381,10 @@ function FindSignTool {
382381
if (Test-Path -Path $SignTool -PathType Leaf) {
383382
return $SignTool
384383
}
384+
$SignTool = "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22621.0\x64\signtool.exe"
385+
if (Test-Path -Path $SignTool -PathType Leaf) {
386+
return $SignTool
387+
}
385388
FailBuild -Message "signtool.exe not found"
386389
}
387390

0 commit comments

Comments
 (0)