@@ -423,11 +423,14 @@ jobs:
423423 tags : ${{ steps.tags.outputs.cann }}
424424
425425 # ---------------------------------------------------------------------------
426- # Trigger model-cli-release workflow (private repo — signs binaries)
426+ # Release CLI for Docker Desktop — build, sign & push CLI + Desktop module image
427+ # (triggers docker/model-cli-release: signs macOS/Windows binaries,
428+ # pushes docker/docker-model-cli-desktop-module to Docker Hub)
427429 # ---------------------------------------------------------------------------
428- trigger-model- cli-release :
430+ release- cli-desktop :
429431 needs : [prepare, test]
430432 runs-on : ubuntu-latest
433+ timeout-minutes : 60
431434 permissions :
432435 contents : read
433436 steps :
@@ -446,12 +449,47 @@ jobs:
446449 -f tag="v$VERSION"
447450 echo "✅ model-cli-release workflow triggered"
448451
452+ - name : Wait for model-cli-release to complete
453+ env :
454+ GH_TOKEN : ${{ secrets.CLI_RELEASE_PAT }}
455+ run : |
456+ echo "⏳ Waiting for model-cli-release workflow to appear..."
457+ sleep 15
458+
459+ # Find the most recent run of release.yml in model-cli-release
460+ for i in $(seq 1 10); do
461+ RUN_ID=$(gh run list \
462+ --repo docker/model-cli-release \
463+ --workflow release.yml \
464+ --limit 1 \
465+ --json databaseId \
466+ --jq '.[0].databaseId')
467+ if [ -n "$RUN_ID" ]; then
468+ echo "Found model-cli-release run: $RUN_ID"
469+ break
470+ fi
471+ echo " Retry $i/10..."
472+ sleep 10
473+ done
474+
475+ if [ -z "$RUN_ID" ]; then
476+ echo "::error::Could not find model-cli-release workflow run"
477+ exit 1
478+ fi
479+
480+ echo "⏳ Waiting for model-cli-release run $RUN_ID to complete..."
481+ gh run watch "$RUN_ID" \
482+ --repo docker/model-cli-release \
483+ --exit-status
484+ echo "✅ model-cli-release workflow completed successfully"
485+
449486 # ---------------------------------------------------------------------------
450- # Trigger Docker CE packaging workflow, wait for it, then trigger release-repo
487+ # Release CLI for Docker CE — build .deb/.rpm packages and deploy to download.docker.com
488+ # (triggers docker/packaging → docker/release-repo)
451489 # ---------------------------------------------------------------------------
452- trigger-packaging :
490+ release-cli-docker-ce :
453491 if : ${{ !inputs.skipPackaging }}
454- needs : [prepare, trigger-model- cli-release ]
492+ needs : [prepare, release- cli-desktop ]
455493 runs-on : ubuntu-latest
456494 timeout-minutes : 120
457495 permissions :
@@ -560,7 +598,7 @@ jobs:
560598 # Create GitHub Release with AI-generated release notes
561599 # ---------------------------------------------------------------------------
562600 github-release :
563- needs : [prepare, release-notes, build, trigger-model- cli-release ]
601+ needs : [prepare, release-notes, build, release- cli-desktop ]
564602 runs-on : ubuntu-latest
565603 permissions :
566604 contents : write
0 commit comments