Merge pull request #9080 from Azure/ignore-dependabot-pr-from-azure-p…

…ipeline Ignore dependabot pr from azure pipeline
Azure · Sep 25, 2023 · d8d82e4 · d8d82e4
2 parents fb3e009 + e6c376e
commit d8d82e4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.azure-pipelines/callGithubWorkflow.yaml b/.azure-pipelines/callGithubWorkflow.yaml
@@ -56,11 +56,11 @@ jobs:
         $branchName = "$(System.PullRequest.SourceBranch)"
         $targetBranch = "$(System.PullRequest.TargetBranch)"
         $pullRequestNumber = "$(System.PullRequest.PullRequestNumber)"
-        $isAutoGeneratedPR = [bool]($branchName -match "-automated-pr")
-        Write-Host "BranchName is $branchName, pullRequestNumber $pullRequestNumber, isAutoGeneratedPR $isAutoGeneratedPR"
+        $isAutoGeneratedOrDependabotPR = [bool]($branchName -match "dependabot/|-automated-pr")
+        Write-Host "BranchName is $branchName, pullRequestNumber $pullRequestNumber, isAutoGeneratedOrDependabotPR $isAutoGeneratedOrDependabotPR"
 
         # NOT MAIN/MASTER OR AUTOMATED BRANCH
-        if ($branchName -ne 'master' -and $isAutoGeneratedPR -eq $false -and $targetBranch -eq 'master')
+        if ($branchName -ne 'master' -and $isAutoGeneratedOrDependabotPR -eq $false -and $targetBranch -eq 'master')
         {
           # INVOKE GITHUB WORKFLOW
           $header = @{
@@ -98,7 +98,7 @@ jobs:
         }
         else
         {
-          Write-Host "Skipping Github Workflow from execution as current branch is a Master branch or is a automated PR or target branch is not master."
+          Write-Host "Skipping Github Workflow from execution as current branch is a Master branch/Automated PR/Dependabot or target branch is not master."
         }
       }
       catch

diff --git a/.github/workflows/checkAutomatedPR.yaml b/.github/workflows/checkAutomatedPR.yaml
@@ -12,7 +12,7 @@ permissions:
   pull-requests: read
 
 env:
-  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref && github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
+  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
   BODY: ${{ github.event.issue.body }}
 
 jobs:

diff --git a/.github/workflows/checkPRContentChange.yaml b/.github/workflows/checkPRContentChange.yaml
@@ -8,7 +8,7 @@ on:
       - "Solutions/**"
 
 env:
-  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref && github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
+  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
 
 jobs:
   solutionNameDetails:

diff --git a/.github/workflows/checkSkipPackagingInfo.yaml b/.github/workflows/checkSkipPackagingInfo.yaml
@@ -13,7 +13,7 @@ on:
         value: ${{ jobs.checkPackagingInfoStatus.outputs.isPackagingRequired }}
 
 env:
-  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref && github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
+  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
 
 jobs:
   checkPackagingInfoStatus:

diff --git a/.github/workflows/getSolutionName.yaml b/.github/workflows/getSolutionName.yaml
@@ -8,7 +8,7 @@ on:
         value: ${{ jobs.currentPRSolutionName.outputs.sName }}
 
 env:
-  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref && github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
+  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
 
 jobs:
   currentPRSolutionName:

diff --git a/.github/workflows/neworexistingsolution.yaml b/.github/workflows/neworexistingsolution.yaml
@@ -17,7 +17,7 @@ on:
         value: ${{ jobs.masterDetails.outputs.solutionPublisherId }}
 
 env:
-  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref && github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
+  BRANCH_NAME: ${{ github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}
 
 jobs:
   masterDetails:

diff --git a/.github/workflows/package-command.yaml b/.github/workflows/package-command.yaml
@@ -4,7 +4,7 @@ env:
   DEFAULTPACKAGEVERSION: "${{ vars.DEFAULTPACKAGEVERSION }}"
   BLOB_CONN_STRING: "${{ secrets.BLOB_CONN_STRING }}"
   BASE_FOLDER_PATH: "${{ vars.BASEFOLDERPATH }}"
-  BRANCH_NAME: "${{ github.event.client_payload.pull_request.head.ref && github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}"
+  BRANCH_NAME: "${{ github.event.client_payload.pull_request.head.ref || github.event.client_payload.pullRequestBranchName }}"
   ADO_TOKEN: "${{ secrets.ADO_TOKEN }}"
   ADO_BASE_URL: "${{ vars.ADO_BASE_URL }}"
   ADO_AREAPATH: "${{ vars.ADO_AREAPATH }}"
@@ -18,13 +18,13 @@ on:
     types: [package-command, Package-command, PACKAGE-command]
 jobs:
   solutionNameDetails:
-    if: ${{ github.actor != 'dependabot[bot]' && !github.event.pull_request.head.repo.fork }}
+    if: ${{ !github.event.pull_request.head.repo.fork && !contains(github.event.client_payload.pull_request.head.ref , 'dependabot/') && !contains(github.event.client_payload.pullRequestBranchName , 'dependabot/') }}
     uses: ./.github/workflows/getSolutionName.yaml
     secrets: inherit
 
   # BELOW JOB WILL CHECK IF WE NEED TO SKIP PACKAGE CREATION OR NOT
   checkSkipPackagingDetails:
-    if: ${{ github.actor != 'dependabot[bot]' && needs.solutionNameDetails.outputs.solutionName != '' && !github.event.pull_request.head.repo.fork }}
+    if: ${{ needs.solutionNameDetails.outputs.solutionName != '' && !github.event.pull_request.head.repo.fork }}
     uses: ./.github/workflows/checkSkipPackagingInfo.yaml
     secrets: inherit
     needs: solutionNameDetails
@@ -34,7 +34,7 @@ jobs:
   neworexistingsolution:
     needs: [solutionNameDetails, checkSkipPackagingDetails]
     uses: ./.github/workflows/neworexistingsolution.yaml
-    if: ${{ github.actor != 'dependabot[bot]' && needs.solutionNameDetails.outputs.solutionName != '' && needs.checkSkipPackagingDetails.outputs.isPackagingRequired == 'True' }} 
+    if: ${{ needs.solutionNameDetails.outputs.solutionName != '' && needs.checkSkipPackagingDetails.outputs.isPackagingRequired == 'True' }}
     with: 
       solutionName: "${{ needs.solutionNameDetails.outputs.solutionName }}"
     secrets: inherit