Skip to content

fix(release): use app tokens and handle applied Mesa patches #1091

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.

Sign up for GitHub

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

Merged
doringeman merged 1 commit into from
Oct 21, 2026
Merged

fix(release): use app tokens and handle applied Mesa patches #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 70 additions & 13 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,10 +509,22 @@ jobs:
echo "already=false" >> "$GITHUB_OUTPUT"
fi

- name: Generate Desktop release token
id: desktop-token
if: steps.published.outputs.already != 'true'
uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3
with:
app-id: ${{ vars.CLI_RELEASE_APP_ID }}
private-key: ${{ secrets.CLI_RELEASE_APP_PRIVATE_KEY }}
owner: docker
repositories: inference-engine-llama.cpp
permission-actions: write

- name: Trigger Desktop CLI release and wait for completion
timeout-minutes: 58
if: steps.published.outputs.already != 'true'
env:
GH_TOKEN: ${{ secrets.CLI_RELEASE_PAT }}
GH_TOKEN: ${{ steps.desktop-token.outputs.token }}
RELEASE_TAG: ${{ needs.prepare.outputs.release_tag }}
VERSION: ${{ needs.prepare.outputs.version }}
run: |
Expand All @@ -528,7 +540,7 @@ jobs:
BEFORE_ID=$(gh run list \
--repo docker/inference-engine-llama.cpp \
--workflow release-cli-dd.yml \
--limit 1 --json databaseId --jq '.[0].databaseId // 0' 2>/dev/null || echo "")
--limit 1 --json databaseId --jq '.[0].databaseId // 0' || echo "")

@sourcery-ai sourcery-ai Bot Oct 21, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Medium · Wrong release run is selected

When another dispatch of the same downstream workflow occurs before the first run-list poll, RUN_ID can identify that other dispatch, so the Desktop job reports success without waiting for this release or packaging publishes the other run’s image as this release’s output.

Correlate the downstream run with this release’s dispatch instead of selecting the newest run ID greater than BEFORE_ID.

Also at .github/workflows/release.yml:567, .github/workflows/release.yml:591, .github/workflows/release.yml:696.

Prompt for AI agents 
In `.github/workflows/release.yml` at line 543:

**Wrong release run is selected**

When another dispatch of the same downstream workflow occurs before the first run-list poll, `RUN_ID` can identify that other dispatch, so the Desktop job reports success without waiting for this release or packaging publishes the other run’s image as this release’s output.

Correlate the downstream run with this release’s dispatch instead of selecting the newest run ID greater than `BEFORE_ID`.

Also at `.github/workflows/release.yml:567`, `.github/workflows/release.yml:591`, `.github/workflows/release.yml:696`.

case "$BEFORE_ID" in
''|*[!0-9]*)
echo "::error::Could not read the pre-dispatch run ID for release-cli-dd.yml"
Expand All @@ -552,7 +564,7 @@ jobs:
CANDIDATE=$(gh run list \
--repo docker/inference-engine-llama.cpp \
--workflow release-cli-dd.yml \
--limit 1 --json databaseId --jq '.[0].databaseId // 0' 2>/dev/null || echo "")
--limit 1 --json databaseId --jq '.[0].databaseId // 0' || echo "")
case "$CANDIDATE" in
''|*[!0-9]*) continue ;;
esac
Expand All @@ -572,9 +584,21 @@ jobs:
echo "✅ Desktop CLI release workflow triggered"

echo "⏳ Waiting for Desktop CLI release to complete..."
gh run watch "$RUN_ID" \
--repo docker/inference-engine-llama.cpp \
--exit-status
# Poll run metadata directly: gh run watch also needs Checks access.
# Finish before the installation token's one-hour expiry.
CONCLUSION=""
for _ in $(seq 1 330); do
RUN=$(gh api "repos/docker/inference-engine-llama.cpp/actions/runs/$RUN_ID")
if [ "$(jq -r '.status' <<< "$RUN")" = "completed" ]; then
CONCLUSION=$(jq -r '.conclusion' <<< "$RUN")
break
fi
sleep 10
done
if [ "$CONCLUSION" != "success" ]; then
echo "::error::Downstream release $RUN_ID ended with ${CONCLUSION:-timeout after 55 minutes}"
exit 1
fi
echo "✅ Desktop CLI release completed successfully"

# ---------------------------------------------------------------------------
Expand All @@ -594,10 +618,21 @@ jobs:
outputs:
packaging_image: ${{ steps.packaging.outputs.packaging_image }}
steps:
- name: Generate packaging token
id: packaging-token
uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3
with:
app-id: ${{ vars.CLI_RELEASE_APP_ID }}
private-key: ${{ secrets.CLI_RELEASE_APP_PRIVATE_KEY }}
owner: docker
repositories: packaging
permission-actions: write

- name: Trigger packaging and wait for completion
timeout-minutes: 58
id: packaging
env:
GH_TOKEN: ${{ secrets.CLI_RELEASE_PAT }}
GH_TOKEN: ${{ steps.packaging-token.outputs.token }}
RELEASE_TAG: ${{ needs.prepare.outputs.release_tag }}
VERSION: ${{ needs.prepare.outputs.version }}
run: |
Expand All @@ -611,7 +646,7 @@ jobs:
BEFORE_ID=$(gh run list \
--repo docker/packaging \
--workflow release-model.yml \
--limit 1 --json databaseId --jq '.[0].databaseId // 0' 2>/dev/null || echo "")
--limit 1 --json databaseId --jq '.[0].databaseId // 0' || echo "")
case "$BEFORE_ID" in
''|*[!0-9]*)
echo "::error::Could not read the pre-dispatch run ID for release-model.yml"
Expand All @@ -634,7 +669,7 @@ jobs:
CANDIDATE=$(gh run list \
--repo docker/packaging \
--workflow release-model.yml \
--limit 1 --json databaseId --jq '.[0].databaseId // 0' 2>/dev/null || echo "")
--limit 1 --json databaseId --jq '.[0].databaseId // 0' || echo "")
case "$CANDIDATE" in
''|*[!0-9]*) continue ;;
esac
Expand All @@ -654,9 +689,21 @@ jobs:
echo "✅ Packaging workflow triggered"

echo "⏳ Waiting for packaging to complete..."
gh run watch "$RUN_ID" \
--repo docker/packaging \
--exit-status
# Poll run metadata directly: gh run watch also needs Checks access.
# Finish before the installation token's one-hour expiry.
CONCLUSION=""
for _ in $(seq 1 330); do
RUN=$(gh api "repos/docker/packaging/actions/runs/$RUN_ID")
if [ "$(jq -r '.status' <<< "$RUN")" = "completed" ]; then
CONCLUSION=$(jq -r '.conclusion' <<< "$RUN")
break
fi
sleep 10
done
if [ "$CONCLUSION" != "success" ]; then
echo "::error::Downstream release $RUN_ID ended with ${CONCLUSION:-timeout after 55 minutes}"
exit 1
fi

# Get the run number to construct the image tag
RUN_NUMBER=$(gh run view "$RUN_ID" \
Expand All @@ -669,9 +716,19 @@ jobs:
echo "packaging_image=$PACKAGING_IMAGE" >> "$GITHUB_OUTPUT"
echo "✅ Packaging workflow completed successfully"

- name: Generate deploy token
id: deploy-token
uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3
with:
app-id: ${{ vars.CLI_RELEASE_APP_ID }}
private-key: ${{ secrets.CLI_RELEASE_APP_PRIVATE_KEY }}
owner: docker
repositories: release-repo
permission-actions: write

- name: Trigger deploy workflow
env:
GH_TOKEN: ${{ secrets.CLI_RELEASE_PAT }}
GH_TOKEN: ${{ steps.deploy-token.outputs.token }}
VERSION: ${{ needs.prepare.outputs.version }}
PACKAGING_IMAGE: ${{ steps.packaging.outputs.packaging_image }}
run: |
Expand Down
21 changes: 18 additions & 3 deletions scripts/apt-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@ enable_source_repos() {
[ -f /etc/apt/sources.list ] && sed -i '/^#\s*deb-src/s/^#\s*//' /etc/apt/sources.list
}

apply_mesa_patch() {
local patch_file="$1"

# Newer Mesa releases may already contain a patch. Check both directions
# explicitly so patch never prompts or silently reverses an existing fix.
if patch -p1 --force --fuzz=0 --dry-run < "$patch_file"; then
patch -p1 --force --fuzz=0 < "$patch_file"
elif patch -p1 --force --fuzz=0 --reverse --dry-run < "$patch_file"; then
echo "Already applied: $patch_file"
else
echo "Mesa patch is incompatible with this source: $patch_file" >&2
return 1
fi
}

rebuild_and_install_mesa() {
enable_source_repos
apt-get update
Expand All @@ -31,9 +46,9 @@ rebuild_and_install_mesa() {

local script_dir
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
patch -p1 < "$script_dir/0001-Revert-venus-filter-out-venus-incapable-physical-dev.patch"
patch -p1 < "$script_dir/0001-virtio-vulkan-force-16k-alignment-for-allocations-HA.patch"
patch -p1 < "$script_dir/0002-virtio-vulkan-silence-stuck-in-wait-message-HACK.patch"
apply_mesa_patch "$script_dir/0001-Revert-venus-filter-out-venus-incapable-physical-dev.patch"
apply_mesa_patch "$script_dir/0001-virtio-vulkan-force-16k-alignment-for-allocations-HA.patch"
apply_mesa_patch "$script_dir/0002-virtio-vulkan-silence-stuck-in-wait-message-HACK.patch"

dpkg-buildpackage -us -uc -b

Expand Down
Loading