From e537a9653b6d911e047fcb069bdde3625702bdcc Mon Sep 17 00:00:00 2001
From: ZelinWang <zelinwang@microsoft.com>
Date: Fri, 12 Apr 2024 15:03:47 +0800
Subject: [PATCH] Update TriggerExtensionRelease.yml

---
 .github/workflows/TriggerExtensionRelease.yml | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/TriggerExtensionRelease.yml b/.github/workflows/TriggerExtensionRelease.yml
index 71a4ee1a49f..81ea1868752 100644
--- a/.github/workflows/TriggerExtensionRelease.yml
+++ b/.github/workflows/TriggerExtensionRelease.yml
@@ -10,14 +10,6 @@ on:
 permissions:
   contents: read
 
-# This is the only solution to trigger OneBranch pipeline from a GitHub commit。
-# But it lacks batch CI support, we have to use concurrency to prevent earlier commits task overwriting index.json from later ones。
-# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency
-concurrency:
-  group: trigger-extension-release
-  # By default, there can be at most one running and one pending job in a concurrency group at any time.
-  cancel-in-progress: false
-
 jobs:
     build:
         name: Trigger Extension Release Pipeline
@@ -27,16 +19,19 @@ jobs:
           uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
           with:
             egress-policy: audit
-        - name: Azure Pipelines Action
-          uses: Azure/pipelines@v1.2
+        - name: Azure login
+          uses: azure/login@v2
+          with:
+            client-id: ${{ secrets.ADO_SP_ClientID }}
+            tenant-id: ${{ secrets.ADO_SP_TenantID }}
+            allow-no-subscriptions: true
+        - name: Azure CLI
+          uses: azure/cli@v2
+          env:
+            ado-org: ${{secrets.ADO_ORGANIZATION}}
+            ado-project: ${{secrets.ADO_PROJECT}}
+            ado-pipeline-id: ${{secrets.ADO_PIPELINE_ID}}
+            commit-id: ${{ github.sha }}
           with:
-            azure-devops-project-url: https://dev.azure.com/azclitools/internal
-            azure-pipeline-name: 'testOneBranchCLI-Official'
-            # https://learn.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate?view=azure-devops&tabs=Windows
-            # expire on 2024/9/21
-            azure-devops-token: ${{ secrets.ONE_BRANCH_TOKEN }}
-            # azure-pipeline-variables:  '{"commit_id": "${{ github.sha }}"}'
-            azure-pipeline-variables:  '{"commit_id": "cd149b7c50dbac2e3124ef1743a3270a727998ca"}'
-        - name: Wait for Extension Release
-          # azure-cli-extensions-release.yml + azure-cli-extensions-sync-after-release.yml ~= 20 minutes
-          run: sleep 1200
+            inlineScript: |
+              az pipelines build queue --definition-id $ado-pipeline-id --organization $ado-org  --project $ado-pipeline-id --variables '{"commit_id": "$commit-id"}'