Skip to content

Commit e4aa733

Browse files
committed
TEMP-TEST: bypass on_main check + add C++ header staging for develop-1.1.0 tag testing
NOT FOR MERGE. This branch exists solely to test Build-Alpaca_Qik-FromRelease.ps1 / Build-QEPM_Qik-FromRelease.ps1 against a develop-based tag (develop-1.1.0), since the publish-release-linux/windows jobs' on_main check normally skips asset upload for any tag whose commit is not an ancestor of origin/main. 1. Bypasses the on_main ancestor check in both publish-release jobs so tagging develop actually produces a GitHub Release with the expected installer assets. 2. Adds staging of interfaces/C++/{EPMDev,UDASDev}/*.h into the installer payload's interfaces/C++/ -- this is a real, permanent packaging gap (not test-only): PROD installs these C++ integrator headers, but build-installer.ps1 never staged them, only Python/C#. This part of the change is a genuine fix that should be proposed separately for real (non-bypass) merge to develop. Signed-off-by: Hang Zhao (QCT) <hangz@qti.qualcomm.com>
1 parent afe6677 commit e4aa733

2 files changed

Lines changed: 20 additions & 18 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,9 @@ jobs:
143143
id: verify_main
144144
run: |
145145
set -euo pipefail
146-
git fetch origin main --quiet
147-
if git merge-base --is-ancestor "$GITHUB_SHA" origin/main; then
148-
echo "Tagged commit $GITHUB_SHA is on main; proceeding with release."
149-
echo "on_main=true" >> "$GITHUB_OUTPUT"
150-
else
151-
echo "Tagged commit $GITHUB_SHA is NOT on main; skipping release publish."
152-
echo "on_main=false" >> "$GITHUB_OUTPUT"
153-
fi
146+
# TEMP-TEST: on_main check bypassed for develop-1.1.0 tag testing only. Do NOT merge this to develop/main.
147+
echo "TEMP-TEST: on_main check bypassed"
148+
echo "on_main=true" >> "$GITHUB_OUTPUT"
154149
155150
- name: Download Linux build artifacts
156151
if: steps.verify_main.outputs.on_main == 'true'
@@ -214,15 +209,9 @@ jobs:
214209
shell: pwsh
215210
run: |
216211
$ErrorActionPreference = 'Stop'
217-
git fetch origin main --quiet
218-
git merge-base --is-ancestor "$env:GITHUB_SHA" origin/main
219-
if ($LASTEXITCODE -eq 0) {
220-
Write-Host "Tagged commit $env:GITHUB_SHA is on main; proceeding with release."
221-
"on_main=true" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
222-
} else {
223-
Write-Host "Tagged commit $env:GITHUB_SHA is NOT on main; skipping release publish."
224-
"on_main=false" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
225-
}
212+
# TEMP-TEST: on_main check bypassed for develop-1.1.0 tag testing only. Do NOT merge this to develop/main.
213+
Write-Host "TEMP-TEST: on_main check bypassed"
214+
"on_main=true" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
226215
227216
- name: Download Windows build artifacts
228217
if: steps.verify_main.outputs.on_main == 'true'

packaging/windows/build-installer.ps1

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,19 @@ if (Test-Path (Join-Path $SourceRoot 'examples')) {
112112

113113
$interfacesDest = Join-Path $data 'interfaces'
114114
New-Item -ItemType Directory -Force -Path $interfacesDest | Out-Null
115+
# C++ integrator headers (no compiled library -- consumers build against these
116+
# directly). Matches PROD parity: PROD ships interfaces\C++\{EPMDev,UDASDev}\ headers.
117+
foreach ($cppMod in @('EPMDev', 'UDASDev')) {
118+
$cppHeaderSrc = Join-Path $SourceRoot "interfaces\C++\$cppMod"
119+
if (Test-Path $cppHeaderSrc) {
120+
$cppHeaderDest = Join-Path $interfacesDest "C++\$cppMod"
121+
New-Item -ItemType Directory -Force -Path $cppHeaderDest | Out-Null
122+
Copy-Item (Join-Path $cppHeaderSrc '*.h') $cppHeaderDest -Force
123+
} else {
124+
Write-Warning "No interfaces\C++\$cppMod directory found; C++ headers will be absent from the installer."
125+
}
126+
}
127+
115128
foreach ($lang in @('Python', 'C#')) {
116129
$srcLang = Join-Path $SourceRoot "interfaces\$lang"
117130
if (Test-Path $srcLang) {
@@ -166,4 +179,4 @@ if (-not (Test-Path $setup)) { throw "IExpress did not produce $setup." }
166179

167180
Write-Host ""
168181
Write-Host "Installer created: $setup"
169-
Write-Host (" size: {0:N1} MB" -f ((Get-Item $setup).Length / 1MB))
182+
Write-Host (" size: {0:N1} MB" -f ((Get-Item $setup).Length / 1MB))

0 commit comments

Comments
 (0)