Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
# Space-separated microsoft/onnxruntime-genai PR numbers fetched from
# pull/<n>.diff and applied on top of v<OGA_VERSION>. Part of the OGA cache
# key. Remove a PR once it lands in the pinned OGA release.
OGA_PR_PATCHES: "2685 2691 2705 2712"
OGA_PR_PATCHES: "2685 2691 2705 2712 2792 2801"
# The GPU arch the artifact targets. CI runners have no GPU, so it is passed
# explicitly (build.py auto-detects from /sys on a real GPU host).
HIP_ARCHITECTURES: gfx11-generic
Expand Down Expand Up @@ -365,7 +365,8 @@ jobs:
# and fails the step. Tests are excluded because OGA does not build
# them and their fixtures do conflict; OGA's own CI workflows are
# excluded because the build does not use them and some no longer
# exist at the pinned tag.
# exist at the pinned tag. Markdown is excluded because the build
# does not read it and doc edits across the listed PRs conflict.
for pr in $prs; do
url="https://github.com/microsoft/onnxruntime-genai/pull/${pr}.diff"
echo "Fetching $url"
Expand All @@ -375,7 +376,7 @@ jobs:
"$url" -o "/tmp/oga-pr-${pr}.diff"
echo "Applying PR #${pr}"
git apply --whitespace=nowarn --3way --exclude='test/*' \
--exclude='.github/*' "/tmp/oga-pr-${pr}.diff" \
--exclude='.github/*' --exclude='*.md' "/tmp/oga-pr-${pr}.diff" \
|| { echo "PR #${pr} failed to apply"; exit 1; }
done

Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/windows-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ env:
# Space-separated microsoft/onnxruntime-genai PR numbers fetched from
# pull/<n>.diff and applied on top of v<OGA_VERSION>. Part of the OGA cache
# key. Remove a PR once it lands in the pinned OGA release.
OGA_PR_PATCHES: "2685 2691 2705 2712 2763"
OGA_PR_PATCHES: "2685 2691 2705 2712 2792 2801"
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: "true"
AMDGPU_EP_REF: "f3dccce2a142567da050da1032617fb39db4086a"
# Space-separated onnxruntime/onnxruntime-ep-amdgpu PR numbers applied on top
Expand Down Expand Up @@ -605,15 +605,17 @@ jobs:
# and fails the step. Tests are excluded because OGA does not build
# them and their fixtures do conflict; OGA's own CI workflows are
# excluded because the build does not use them and some no longer
# exist at the pinned tag.
# exist at the pinned tag. Markdown is excluded because the build
# does not read it and doc edits across the listed PRs conflict.
foreach ($pr in $prs -split '\s+') {
if (-not $pr) { continue }
$url = "https://github.com/microsoft/onnxruntime-genai/pull/$pr.diff"
$tmp = Join-Path $env:RUNNER_TEMP "oga-pr-$pr.diff"
Write-Host "Fetching $url"
Invoke-WebRequest -Uri $url -OutFile $tmp -UseBasicParsing
# github.com throttles raw .diff fetches with HTTP 429.
Invoke-WebRequest -Uri $url -OutFile $tmp -UseBasicParsing -MaximumRetryCount 6 -RetryIntervalSec 10
Write-Host "Applying PR #$pr"
git apply --whitespace=nowarn --3way --exclude='test/*' --exclude='.github/*' $tmp
git apply --whitespace=nowarn --3way --exclude='test/*' --exclude='.github/*' --exclude='*.md' $tmp
if ($LASTEXITCODE -ne 0) {
throw "PR #$pr failed to apply (exit $LASTEXITCODE)"
}
Expand Down
Loading