-
Notifications
You must be signed in to change notification settings - Fork 309
C++ CI (not ready for review - testing what works, and what does not) #684
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nenad1002
wants to merge
12
commits into
main
Choose a base branch
from
nebanfic/prathik-ci
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
e206b5d
cpp
8c8ef3e
bug fixes
be7aa0f
Merge remote-tracking branch 'origin' into prathikrao/cpp-ci-integration
73f39ba
simplify
9fcc37f
vcpkg commit hash
cead063
prep step
bb0722c
test fixes
28b0b68
deps install fix
d3fb222
noop
a668a98
new env var
791bfc4
overlay
ff1767b
Try fix test
nenad1002 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| # Steps to package the C++ SDK source into a release archive. | ||
| # The archive contains headers, source, CMake config, and deps_versions.json | ||
| # so consumers can build from source with their own toolchain. | ||
| parameters: | ||
| - name: isWinML | ||
| type: boolean | ||
| default: false | ||
| - name: outputDir | ||
| type: string | ||
| default: '$(Build.ArtifactStagingDirectory)/cpp-sdk' | ||
| displayName: 'Path to directory for the packaged SDK' | ||
| - name: depsVersionsDir | ||
| type: string | ||
| default: '' | ||
| displayName: 'Path to deps-versions artifact directory' | ||
| steps: | ||
| # Set paths for multi-repo checkout | ||
| - task: PowerShell@2 | ||
| displayName: 'Set source paths' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| $multiCheckout = "$(Build.SourcesDirectory)/Foundry-Local" | ||
| if (Test-Path $multiCheckout) { | ||
| $repoRoot = $multiCheckout | ||
| } else { | ||
| $repoRoot = "$(Build.SourcesDirectory)" | ||
| } | ||
| Write-Host "##vso[task.setvariable variable=repoRoot]$repoRoot" | ||
|
|
||
| # Read version from the version-info artifact produced by compute_version stage. | ||
| - task: PowerShell@2 | ||
| displayName: 'Set SDK version' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| $v = (Get-Content "$(Pipeline.Workspace)/version-info/sdkVersion.txt" -Raw).Trim() | ||
| Write-Host "C++ SDK version: $v" | ||
|
|
||
| # Patch vcpkg.json version-string | ||
| $vcpkgPath = "$(repoRoot)/sdk/cpp/vcpkg.json" | ||
| $content = Get-Content $vcpkgPath -Raw | ||
| $content = $content -replace '"version-string"\s*:\s*"[^"]+"', "`"version-string`": `"$v`"" | ||
| Set-Content -Path $vcpkgPath -Value $content | ||
|
|
||
| # Patch CMakeLists.txt project version (CMake only accepts MAJOR.MINOR.PATCH[.TWEAK]) | ||
| $cmakeVer = ($v -split '-')[0] | ||
| $cmakePath = "$(repoRoot)/sdk/cpp/CMakeLists.txt" | ||
| $content = Get-Content $cmakePath -Raw | ||
| $content = $content -replace 'project\(CppSdk\s+VERSION\s+[^\s]+', "project(CppSdk VERSION $cmakeVer" | ||
| Set-Content -Path $cmakePath -Value $content | ||
|
|
||
| Write-Host "##vso[task.setvariable variable=cppSdkVersion]$v" | ||
|
|
||
| # Load dependency versions from deps_versions.json so the archive has correct versions | ||
| - template: update-deps-versions-steps.yml | ||
| parameters: | ||
| repoRoot: $(repoRoot) | ||
| artifactDir: ${{ parameters.depsVersionsDir }} | ||
| isWinML: ${{ parameters.isWinML }} | ||
|
|
||
| # Archive the SDK source tree for GitHub Releases | ||
| - task: PowerShell@2 | ||
| displayName: 'Package SDK source' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| $destDir = "${{ parameters.outputDir }}" | ||
| New-Item -ItemType Directory -Path $destDir -Force | Out-Null | ||
|
|
||
| $zipPath = "$destDir/foundry-local-cpp-sdk-$(cppSdkVersion).zip" | ||
| Compress-Archive -Path "$(repoRoot)/sdk/cpp/*" -DestinationPath $zipPath -Force | ||
| Write-Host "Packaged SDK source: $zipPath" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| # Steps to test the C++ SDK. | ||
| # Runs unit tests (mocked, no Core DLL needed) and E2E tests (requires Core DLL). | ||
| parameters: | ||
| - name: isWinML | ||
| type: boolean | ||
| default: false | ||
| - name: flcNugetDir | ||
| type: string | ||
| displayName: 'Path to directory containing the FLC .nupkg' | ||
| - name: depsVersionsDir | ||
| type: string | ||
| default: '' | ||
| displayName: 'Path to deps-versions artifact directory' | ||
|
|
||
| steps: | ||
| - task: PowerShell@2 | ||
| displayName: 'Set source paths' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| $multiCheckout = "$(Build.SourcesDirectory)/Foundry-Local" | ||
| if (Test-Path $multiCheckout) { | ||
| $repoRoot = $multiCheckout | ||
| } else { | ||
| $repoRoot = "$(Build.SourcesDirectory)" | ||
| } | ||
| $testDataDir = "$(Build.SourcesDirectory)/test-data-shared" | ||
| Write-Host "##vso[task.setvariable variable=repoRoot]$repoRoot" | ||
| Write-Host "##vso[task.setvariable variable=testDataDir]$testDataDir" | ||
|
|
||
| # Load dependency versions from deps_versions.json | ||
| - template: update-deps-versions-steps.yml | ||
| parameters: | ||
| repoRoot: $(repoRoot) | ||
| artifactDir: ${{ parameters.depsVersionsDir }} | ||
| isWinML: ${{ parameters.isWinML }} | ||
|
|
||
| # Extract FLC native binaries from the pipeline-built .nupkg | ||
| - task: PowerShell@2 | ||
| displayName: 'Extract FLC native binaries' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| $nupkg = Get-ChildItem "${{ parameters.flcNugetDir }}" -Recurse -Filter "Microsoft.AI.Foundry.Local.Core*.nupkg" -Exclude "*.snupkg" | Select-Object -First 1 | ||
| if (-not $nupkg) { throw "No FLC .nupkg found in ${{ parameters.flcNugetDir }}" } | ||
|
|
||
| $extractDir = "$(Build.ArtifactStagingDirectory)/flc-extract-cpp" | ||
| $zip = [System.IO.Path]::ChangeExtension($nupkg.FullName, ".zip") | ||
| Copy-Item $nupkg.FullName $zip -Force | ||
| Expand-Archive -Path $zip -DestinationPath $extractDir -Force | ||
|
|
||
| $arch = if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq 'Arm64') { 'arm64' } else { 'x64' } | ||
| $rid = "win-$arch" | ||
|
|
||
| $nativeDir = "$extractDir/runtimes/$rid/native" | ||
| if (-not (Test-Path $nativeDir)) { throw "No native binaries found at $nativeDir for RID $rid" } | ||
|
|
||
| $flcNativeDir = "$(Build.ArtifactStagingDirectory)/flc-native-cpp" | ||
| New-Item -ItemType Directory -Path $flcNativeDir -Force | Out-Null | ||
| Get-ChildItem $nativeDir -File | Copy-Item -Destination $flcNativeDir -Force | ||
| Write-Host "##vso[task.setvariable variable=FOUNDRY_NATIVE_OVERRIDE_DIR]$flcNativeDir" | ||
| Write-Host "Extracted FLC native binaries to $flcNativeDir" | ||
|
|
||
| # Ensure vcpkg is available | ||
| - task: PowerShell@2 | ||
| displayName: 'Bootstrap vcpkg' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| if ($env:VCPKG_ROOT -and (Test-Path "$env:VCPKG_ROOT/vcpkg.exe")) { | ||
| Write-Host "vcpkg already available at $env:VCPKG_ROOT" | ||
| } else { | ||
| $vcpkgDir = "$(Build.ArtifactStagingDirectory)/vcpkg" | ||
| git clone https://github.com/microsoft/vcpkg.git $vcpkgDir | ||
| & "$vcpkgDir/bootstrap-vcpkg.bat" -disableMetrics | ||
| Write-Host "##vso[task.setvariable variable=VCPKG_ROOT]$vcpkgDir" | ||
| Write-Host "##vso[task.prependpath]$vcpkgDir" | ||
| Write-Host "Bootstrapped vcpkg at $vcpkgDir" | ||
| } | ||
|
|
||
| # Configure and build with tests enabled | ||
| - task: PowerShell@2 | ||
| displayName: 'CMake configure' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| Set-Location "$(repoRoot)/sdk/cpp" | ||
|
|
||
| $buildDir = "$(Build.ArtifactStagingDirectory)/cpp-test-build" | ||
|
|
||
| cmake -G "Visual Studio 17 2022" -A x64 ` | ||
| -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" ` | ||
| -DVCPKG_OVERLAY_TRIPLETS="$(repoRoot)/sdk/cpp/triplets" ` | ||
| -DVCPKG_OVERLAY_PORTS="$(repoRoot)/sdk/cpp/vcpkg-overlay-ports" ` | ||
| -DVCPKG_TARGET_TRIPLET=x64-windows-static-md ` | ||
| -DBUILD_TESTING=ON ` | ||
| -B "$buildDir" ` | ||
| -S "$(repoRoot)/sdk/cpp" | ||
| if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } | ||
| env: | ||
| PKG_CONFIG: 'echo' | ||
|
|
||
| - task: PowerShell@2 | ||
| displayName: 'CMake build' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| $buildDir = "$(Build.ArtifactStagingDirectory)/cpp-test-build" | ||
| cmake --build $buildDir --config Release | ||
| if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } | ||
|
|
||
| # Run unit tests (mocked — no Core DLL needed) | ||
| - task: PowerShell@2 | ||
| displayName: 'Run unit tests' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| $buildDir = "$(Build.ArtifactStagingDirectory)/cpp-test-build" | ||
| $testResultsDir = "$(Build.ArtifactStagingDirectory)/test-results" | ||
| New-Item -ItemType Directory -Path $testResultsDir -Force | Out-Null | ||
| Set-Location $buildDir | ||
|
|
||
| # Run only the unit test executable with JUnit XML output | ||
| & ./CppSdkTests --gtest_output=xml:$testResultsDir/unit-tests.xml | ||
| if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } | ||
|
|
||
| # Run E2E tests (requires Core DLL) | ||
| - task: PowerShell@2 | ||
| displayName: 'Run E2E tests' | ||
| inputs: | ||
| targetType: inline | ||
| script: | | ||
| $buildDir = "$(Build.ArtifactStagingDirectory)/cpp-test-build" | ||
| $testResultsDir = "$(Build.ArtifactStagingDirectory)/test-results" | ||
| Set-Location $buildDir | ||
|
|
||
| & ./CppSdkE2ETests --gtest_output=xml:$testResultsDir/e2e-tests.xml | ||
| if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } | ||
|
Comment on lines
+137
to
+138
|
||
| env: | ||
| TF_BUILD: 'true' | ||
| FOUNDRY_TEST_DATA_DIR: $(testDataDir) | ||
|
|
||
| # Publish test results | ||
| - task: PublishTestResults@2 | ||
| displayName: 'Publish test results' | ||
| inputs: | ||
| testResultsFormat: 'JUnit' | ||
| testResultsFiles: '$(Build.ArtifactStagingDirectory)/test-results/*.xml' | ||
| testRunTitle: 'C++ SDK Tests' | ||
| failTaskOnFailedTests: true | ||
| condition: always() | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the Visual Studio multi-config generator, test binaries are typically emitted under a configuration subdirectory (e.g.,
Release/CppSdkTests.exe), so invoking./CppSdkTestsand./CppSdkE2ETestsfrom the build root is likely to fail. Preferctest -C Release(and let CMake/CTest locate the executables), or invoke the explicit config path (e.g.,${buildDir}/Release/CppSdkTests.exe).