Skip to content

Commit 44c6f9f

Browse files
committed
Update Avalonia package versions and modify Inno Setup installation in release workflow
1 parent 5793a8f commit 44c6f9f

File tree

2 files changed

+43
-17
lines changed

2 files changed

+43
-17
lines changed

.github/workflows/release.yml

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@ jobs:
3939
with:
4040
dotnet-version: '10.0.x'
4141

42-
- name: Setup Inno Setup
43-
uses: nadeemjazmawe/inno-setup-action-cli@v6.0.5
42+
- name: Install Inno Setup via Chocolatey
43+
run: |
44+
choco install innosetup -y
45+
# Add to path for current session
46+
$env:PATH += ";C:\Program Files (x86)\Inno Setup 6"
4447
4548
- name: Restore dependencies
4649
run: dotnet restore SemanticCode.sln
@@ -55,17 +58,40 @@ jobs:
5558
# Remove .pdb files if any exist
5659
if (Test-Path "*.pdb") { Remove-Item "*.pdb" }
5760
58-
- name: Prepare installer directory
59-
run: |
60-
# Create dist directory
61-
if (!(Test-Path "dist")) { New-Item -ItemType Directory -Path "dist" }
62-
6361
- name: Create Windows installer with Inno Setup
64-
uses: nadeemjazmawe/inno-setup-action-cli@v6.0.5
65-
with:
66-
filepath: setup/setup.iss
6762
env:
6863
APP_VERSION: ${{ needs.prepare.outputs.version }}
64+
run: |
65+
# Create dist directory
66+
if (!(Test-Path "dist")) { New-Item -ItemType Directory -Path "dist" }
67+
# Find iscc.exe and run it
68+
$isccPath = @(
69+
"C:\Program Files (x86)\Inno Setup 6\iscc.exe",
70+
"C:\Program Files\Inno Setup 6\iscc.exe",
71+
"C:\tools\InnoSetup\iscc.exe"
72+
) | Where-Object { Test-Path $_ } | Select-Object -First 1
73+
74+
if (-not $isccPath) {
75+
# Search in chocolatey installation paths
76+
$chocoPath = Get-ChildItem -Path "C:\ProgramData\chocolatey" -Recurse -Name "iscc.exe" -ErrorAction SilentlyContinue | Select-Object -First 1
77+
if ($chocoPath) {
78+
$isccPath = "C:\ProgramData\chocolatey\$chocoPath"
79+
}
80+
}
81+
82+
if ($isccPath) {
83+
Write-Host "Using ISCC at: $isccPath"
84+
& $isccPath setup/setup.iss
85+
} else {
86+
Write-Host "ISCC not found in standard locations, trying PATH"
87+
# Try direct command
88+
try {
89+
iscc setup/setup.iss
90+
} catch {
91+
Write-Error "Failed to run iscc: $_"
92+
exit 1
93+
}
94+
}
6995
7096
- name: Create Windows archive (fallback)
7197
run: |

Directory.Packages.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<InformationalVersion>$(Version)</InformationalVersion>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageVersion Include="Avalonia" Version="11.3.2" />
11-
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.2" />
12-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.2" />
13-
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.2" />
14-
<PackageVersion Include="Avalonia.Desktop" Version="11.3.2" />
15-
<PackageVersion Include="Avalonia.Browser" Version="11.3.2" />
16-
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.2" />
10+
<PackageVersion Include="Avalonia" Version="11.3.3" />
11+
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.3" />
12+
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.3" />
13+
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.3" />
14+
<PackageVersion Include="Avalonia.Desktop" Version="11.3.3" />
15+
<PackageVersion Include="Avalonia.Browser" Version="11.3.3" />
16+
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.3" />
1717
<PackageVersion Include="FluentAvaloniaUI" Version="2.4.0" />
1818
</ItemGroup>
1919
</Project>

0 commit comments

Comments
 (0)