Skip to content

Commit 017fdde

Browse files
Feature/installer automation
1 parent 1f3ffbb commit 017fdde

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build-installer.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
BUILD_CONFIGURATION: Release
1818
SOLUTION_PATH: 'src\vcxproj\salamand.sln'
1919
REMOVE_PROJ_PATH: 'src\vcxproj\setup\remove.vcxproj'
20-
# Important: Use a relative path within the workspace for reliability
20+
# OPENSAL_BUILD_DIR MUST end with a backslash as expected by props files
2121
OPENSAL_BUILD_DIR: '${{ github.workspace }}\build_stage\'
2222

2323
steps:
@@ -30,17 +30,17 @@ jobs:
3030
- name: Build Solution (Release | x64)
3131
run: |
3232
New-Item -ItemType Directory -Force -Path $env:OPENSAL_BUILD_DIR
33-
msbuild $env:SOLUTION_PATH /m /t:Build /p:Configuration=$env:BUILD_CONFIGURATION /p:Platform=x64 /p:PreferredToolArchitecture=x64 /p:OutDir=$env:OPENSAL_BUILD_DIR
33+
# We do NOT pass /p:OutDir here, we let the project props use OPENSAL_BUILD_DIR
34+
msbuild $env:SOLUTION_PATH /m /t:Build /p:Configuration=$env:BUILD_CONFIGURATION /p:Platform=x64 /p:PreferredToolArchitecture=x64
3435
3536
- name: Build Uninstaller (Release | x64)
3637
run: |
37-
# OutDir for remove needs to be specific to avoid overwriting or missing files if not handled by the solution OutDir
38-
msbuild $env:REMOVE_PROJ_PATH /m /t:Build /p:Configuration=$env:BUILD_CONFIGURATION /p:Platform=x64 /p:PreferredToolArchitecture=x64 /p:OutDir="${{ env.OPENSAL_BUILD_DIR }}remove\Release_x64\"
38+
# remove.vcxproj also respects OPENSAL_BUILD_DIR
39+
msbuild $env:REMOVE_PROJ_PATH /m /t:Build /p:Configuration=$env:BUILD_CONFIGURATION /p:Platform=x64 /p:PreferredToolArchitecture=x64
3940
4041
- name: Prepare and Create Installer
4142
run: |
42-
# We need to make sure the expected structure exists in build_stage for our script
43-
# Some projects might not follow the global OutDir perfectly if they have hardcoded paths in props
43+
# Our script is already robust and searches for files within OPENSAL_BUILD_DIR
4444
powershell.exe -File tools\prepare_installer.ps1 -BuildDir $env:OPENSAL_BUILD_DIR -OutputPath "OpenSalamander_5.0.${{ github.run_number }}.exe"
4545
4646
- name: Create Release

0 commit comments

Comments
 (0)