From 947bb1f52d965c7d610c5b310afb1fdc849b5420 Mon Sep 17 00:00:00 2001 From: v-amolpatil Date: Sun, 4 Feb 2024 15:52:26 +0530 Subject: [PATCH 1/8] updated code --- .github/workflows/AddLabel.yaml | 16 +++++++++++++++- .github/workflows/IssueComment.yml | 17 +++++++++++++++-- .github/workflows/addComment.yaml | 15 ++++++++++++++- .github/workflows/addLabelOnPr.yaml | 16 +++++++++++++++- .github/workflows/arm-ttk-validations.yaml | 4 ++-- .github/workflows/checkAutomatedPR.yaml | 2 +- .github/workflows/package-command.yaml | 2 +- .github/workflows/package-on-fork.yaml | 2 +- .github/workflows/package-on-merge.yaml | 8 ++++---- 9 files changed, 68 insertions(+), 14 deletions(-) diff --git a/.github/workflows/AddLabel.yaml b/.github/workflows/AddLabel.yaml index 1797a586717..0d1808950c1 100644 --- a/.github/workflows/AddLabel.yaml +++ b/.github/workflows/AddLabel.yaml @@ -8,6 +8,10 @@ on: paths: - Solutions/** +env: + GITHUB_APPS_ID: "${{ secrets.APPLICATION_ID }}" + GITHUB_APPS_KEY: "${{ secrets.APPLICATION_PRIVATE_KEY }}" + jobs: solutionNameDetails: if: ${{ github.actor != 'dependabot[bot]' && !github.event.pull_request.head.repo.fork && !contains(github.event.pull_request.labels.*.name, 'P0')}} @@ -27,9 +31,19 @@ jobs: needs: solutionPublisherDetail if: ${{ github.actor != 'dependabot[bot]' && needs.solutionPublisherDetail.outputs.solutionPublisherId != '' && !contains(fromJson(vars.INTERNAL_PUBLISHERS),needs.solutionPublisherDetail.outputs.solutionPublisherId) }} steps: + - name: Generate a token + id: generate_token + uses: actions/create-github-app-token@46e4a501e119d39574a54e53a06c9a705efc55c9 + with: + app-id: ${{ env.GITHUB_APPS_ID }} + private-key: ${{ env.GITHUB_APPS_KEY }} + - name: Add Label Notification - uses: actions/github-script@v6 + uses: actions/github-script@b7fb2001b410c9390cbe9e2c7d5cab7eefb7b29c + env: + APPTOKEN: ${{ steps.generate_token.outputs.token }} with: + github-token: ${{ env.APPTOKEN }} script: | github.rest.issues.addLabels({ issue_number: context.issue.number, diff --git a/.github/workflows/IssueComment.yml b/.github/workflows/IssueComment.yml index bdecd70c842..47f799213b2 100644 --- a/.github/workflows/IssueComment.yml +++ b/.github/workflows/IssueComment.yml @@ -4,13 +4,26 @@ on: issues: types: opened +env: + GITHUB_APPS_ID: "${{ secrets.APPLICATION_ID }}" + GITHUB_APPS_KEY: "${{ secrets.APPLICATION_PRIVATE_KEY }}" + jobs: commenting: runs-on: ubuntu-latest steps: - - uses: actions/github-script@0.3.0 + - name: Generate a token + id: generate_token + uses: actions/create-github-app-token@46e4a501e119d39574a54e53a06c9a705efc55c9 + with: + app-id: ${{ env.GITHUB_APPS_ID }} + private-key: ${{ env.GITHUB_APPS_KEY }} + + - uses: actions/github-script@b7fb2001b410c9390cbe9e2c7d5cab7eefb7b29c + env: + APPTOKEN: ${{ steps.generate_token.outputs.token }} with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ env.APPTOKEN }} script: | const { issue: { number: issue_number }, repo: { owner, repo } } = context; github.issues.createComment({ issue_number, owner, repo, body: 'Thank you for submitting an Issue to the Azure Sentinel GitHub repo! You should expect an initial response to your Issue from the team within 5 business days. Note that this response may be delayed during holiday periods. For urgent, production-affecting issues please raise a support ticket via the Azure Portal.' }); diff --git a/.github/workflows/addComment.yaml b/.github/workflows/addComment.yaml index 7bf29a33068..d0cbcd76288 100644 --- a/.github/workflows/addComment.yaml +++ b/.github/workflows/addComment.yaml @@ -10,15 +10,28 @@ on: required: false type: string +env: + GITHUB_APPS_ID: "${{ secrets.APPLICATION_ID }}" + GITHUB_APPS_KEY: "${{ secrets.APPLICATION_PRIVATE_KEY }}" + jobs: comment: runs-on: ubuntu-latest steps: - - uses: actions/github-script@29423367f079522048aa7c63f671593b0556ffd5 + - name: Generate a token + id: generate_token + uses: actions/create-github-app-token@46e4a501e119d39574a54e53a06c9a705efc55c9 + with: + app-id: ${{ env.GITHUB_APPS_ID }} + private-key: ${{ env.GITHUB_APPS_KEY }} + + - uses: actions/github-script@b7fb2001b410c9390cbe9e2c7d5cab7eefb7b29c env: MESSAGE: ${{ inputs.message}} PR_NUMBER: ${{ inputs.prNumber }} + APPTOKEN: ${{ steps.generate_token.outputs.token }} with: + github-token: ${{ env.APPTOKEN }} script: | $prNumber = process.env.PR_NUMBER $prNumber = $prNumber ? $prNumber : context.issue.number diff --git a/.github/workflows/addLabelOnPr.yaml b/.github/workflows/addLabelOnPr.yaml index 7189328d4f7..f6edd510a5f 100644 --- a/.github/workflows/addLabelOnPr.yaml +++ b/.github/workflows/addLabelOnPr.yaml @@ -7,14 +7,28 @@ on: required: true type: string +env: + GITHUB_APPS_ID: "${{ secrets.APPLICATION_ID }}" + GITHUB_APPS_KEY: "${{ secrets.APPLICATION_PRIVATE_KEY }}" + jobs: addLabelOnPR: if: ${{ !github.event.pull_request.head.repo.fork }} runs-on: ubuntu-latest steps: - - uses: actions/github-script@29423367f079522048aa7c63f671593b0556ffd5 + - name: Generate a token + id: generate_token + uses: actions/create-github-app-token@46e4a501e119d39574a54e53a06c9a705efc55c9 + with: + app-id: ${{ env.GITHUB_APPS_ID }} + private-key: ${{ env.GITHUB_APPS_KEY }} + + - uses: actions/github-script@b7fb2001b410c9390cbe9e2c7d5cab7eefb7b29c name: Add Label To Pull Request + env: + APPTOKEN: ${{ steps.generate_token.outputs.token }} with: + github-token: ${{ env.APPTOKEN }} script: | $labelName = "${{ inputs.labelName }}" console.log('PR Number : ' + context.issue.number + ', LabelName ' + $labelName) diff --git a/.github/workflows/arm-ttk-validations.yaml b/.github/workflows/arm-ttk-validations.yaml index ec0a00b9d4e..1aded51a98f 100644 --- a/.github/workflows/arm-ttk-validations.yaml +++ b/.github/workflows/arm-ttk-validations.yaml @@ -10,7 +10,7 @@ jobs: mainTemplateChanged: ${{ steps.step1.outputs.mainTemplateChanged }} createUiChanged: ${{ steps.step1.outputs.createUiChanged }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab with: fetch-depth: 0 - shell: pwsh @@ -21,7 +21,7 @@ jobs: Install-Module powershell-yaml ./.script/package-automation/arm-ttk-tests.ps1 - - uses: docker/build-push-action@v2 + - uses: docker/build-push-action@4976231911ebf5f32aad765192d35f942aa48cb8 id: publishGithubPackage name: Run ARM-TTK if: ${{ success() && steps.step1.outcome == 'success' && steps.step1.outputs.solutionName != '' && (steps.step1.outputs.mainTemplateChanged == 'true' || steps.step1.outputs.createUiChanged == 'true') }} diff --git a/.github/workflows/checkAutomatedPR.yaml b/.github/workflows/checkAutomatedPR.yaml index f7ce6468991..674597d123d 100644 --- a/.github/workflows/checkAutomatedPR.yaml +++ b/.github/workflows/checkAutomatedPR.yaml @@ -22,7 +22,7 @@ jobs: $pullRequestBranchName = "$env:BranchName" Write-Host "Pull Request Branch Name is $pullRequestBranchName" $isAutomatedPR = $false - if ($pullRequestBranchName -like '*automated-pr') + if ($pullRequestBranchName -like '*automated-pr' -or $pullRequestBranchName -like '*dependabot/*') { Write-Host "Skipping packaging as it is an automated pr!" $isAutomatedPR = $true diff --git a/.github/workflows/package-command.yaml b/.github/workflows/package-command.yaml index 20e737e1bf6..633e10bd06e 100644 --- a/.github/workflows/package-command.yaml +++ b/.github/workflows/package-command.yaml @@ -45,7 +45,7 @@ jobs: $pullRequestBranchName = "$env:BranchName" Write-Host "Pull Request Branch Name is $pullRequestBranchName" $isAutomatedPR = $false - if ($pullRequestBranchName -like '*automated-pr') + if ($pullRequestBranchName -like '*automated-pr' -or $pullRequestBranchName -like '*dependabot/*') { Write-Host "Skipping packaging as it is an automated pr!" $isAutomatedPR = $true diff --git a/.github/workflows/package-on-fork.yaml b/.github/workflows/package-on-fork.yaml index 505dccc16e1..3f042853945 100644 --- a/.github/workflows/package-on-fork.yaml +++ b/.github/workflows/package-on-fork.yaml @@ -46,7 +46,7 @@ jobs: $forkPRBranchName = "$env:BranchName" Write-Host "Fork Branch Name is $forkPRBranchName" $isAutomatedPR = $false - if ($forkPRBranchName -like '*automated-pr') + if ($forkPRBranchName -like '*automated-pr' -or $forkPRBranchName -like '*dependabot/*') { Write-Host "Skipping packaging as it is an automated fork pr!" $isAutomatedPR = $true diff --git a/.github/workflows/package-on-merge.yaml b/.github/workflows/package-on-merge.yaml index 980513b8579..55d718d6c88 100644 --- a/.github/workflows/package-on-merge.yaml +++ b/.github/workflows/package-on-merge.yaml @@ -42,12 +42,12 @@ jobs: BranchName: ${{ github.event.pull_request.head.ref }} shell: pwsh run: | - $forkPRBranchName = "$env:BranchName" - Write-Host "Fork Branch Name is $forkPRBranchName" + $PRBranchName = "$env:BranchName" + Write-Host "Branch Name is $PRBranchName" $isAutomatedPR = $false - if ($forkPRBranchName -like '*automated-pr') + if ($PRBranchName -like '*automated-pr' -or $PRBranchName -like '*dependabot/*') { - Write-Host "Skipping packaging as it is an automated fork pr!" + Write-Host "Skipping packaging as it is an automated pr!" $isAutomatedPR = $true } Write-Output "isAutomatedPR=$isAutomatedPR" >> $env:GITHUB_OUTPUT From 841b19c799ee8219f80596ca31236ff8993da629 Mon Sep 17 00:00:00 2001 From: v-amolpatil Date: Sun, 4 Feb 2024 20:42:10 +0530 Subject: [PATCH 2/8] Update package-on-merge.yaml --- .github/workflows/package-on-merge.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-on-merge.yaml b/.github/workflows/package-on-merge.yaml index 55d718d6c88..d6aae568b63 100644 --- a/.github/workflows/package-on-merge.yaml +++ b/.github/workflows/package-on-merge.yaml @@ -101,7 +101,7 @@ jobs: - name: createNewPR id: createNewPR - if: ${{ success() }} + if: ${{ success() && steps.validateAndCreatePackage.outcome == 'success' }} uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5 env: SOLUTION_NAME: "${{ steps.validateAndCreatePackage.outputs.solutionName }}" From 2661b2441fc011c4bce21c8bb24ce224bb6e2f92 Mon Sep 17 00:00:00 2001 From: v-amolpatil Date: Sun, 4 Feb 2024 20:50:54 +0530 Subject: [PATCH 3/8] reverted --- .github/workflows/package-on-fork.yaml | 2 +- .github/workflows/package-on-merge.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package-on-fork.yaml b/.github/workflows/package-on-fork.yaml index 3f042853945..505dccc16e1 100644 --- a/.github/workflows/package-on-fork.yaml +++ b/.github/workflows/package-on-fork.yaml @@ -46,7 +46,7 @@ jobs: $forkPRBranchName = "$env:BranchName" Write-Host "Fork Branch Name is $forkPRBranchName" $isAutomatedPR = $false - if ($forkPRBranchName -like '*automated-pr' -or $forkPRBranchName -like '*dependabot/*') + if ($forkPRBranchName -like '*automated-pr') { Write-Host "Skipping packaging as it is an automated fork pr!" $isAutomatedPR = $true diff --git a/.github/workflows/package-on-merge.yaml b/.github/workflows/package-on-merge.yaml index d6aae568b63..317b25eb834 100644 --- a/.github/workflows/package-on-merge.yaml +++ b/.github/workflows/package-on-merge.yaml @@ -45,7 +45,7 @@ jobs: $PRBranchName = "$env:BranchName" Write-Host "Branch Name is $PRBranchName" $isAutomatedPR = $false - if ($PRBranchName -like '*automated-pr' -or $PRBranchName -like '*dependabot/*') + if ($PRBranchName -like '*automated-pr') { Write-Host "Skipping packaging as it is an automated pr!" $isAutomatedPR = $true From 9bccb20fc65fb0b78f699ad496e2892f0cc192ef Mon Sep 17 00:00:00 2001 From: v-amolpatil Date: Sun, 4 Feb 2024 20:51:38 +0530 Subject: [PATCH 4/8] Update checkAutomatedPR.yaml --- .github/workflows/checkAutomatedPR.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checkAutomatedPR.yaml b/.github/workflows/checkAutomatedPR.yaml index 674597d123d..f7ce6468991 100644 --- a/.github/workflows/checkAutomatedPR.yaml +++ b/.github/workflows/checkAutomatedPR.yaml @@ -22,7 +22,7 @@ jobs: $pullRequestBranchName = "$env:BranchName" Write-Host "Pull Request Branch Name is $pullRequestBranchName" $isAutomatedPR = $false - if ($pullRequestBranchName -like '*automated-pr' -or $pullRequestBranchName -like '*dependabot/*') + if ($pullRequestBranchName -like '*automated-pr') { Write-Host "Skipping packaging as it is an automated pr!" $isAutomatedPR = $true From 850d0cfcf5f0e8b8279dd74386887b87dc19ab86 Mon Sep 17 00:00:00 2001 From: v-amolpatil Date: Mon, 5 Feb 2024 14:42:30 +0530 Subject: [PATCH 5/8] Update IssueComment.yml --- .github/workflows/IssueComment.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/IssueComment.yml b/.github/workflows/IssueComment.yml index 47f799213b2..e81eb17d0a3 100644 --- a/.github/workflows/IssueComment.yml +++ b/.github/workflows/IssueComment.yml @@ -22,8 +22,13 @@ jobs: - uses: actions/github-script@b7fb2001b410c9390cbe9e2c7d5cab7eefb7b29c env: APPTOKEN: ${{ steps.generate_token.outputs.token }} + githubToken: ${{ secrets.GITHUB_TOKEN }} with: github-token: ${{ env.APPTOKEN }} script: | - const { issue: { number: issue_number }, repo: { owner, repo } } = context; - github.issues.createComment({ issue_number, owner, repo, body: 'Thank you for submitting an Issue to the Azure Sentinel GitHub repo! You should expect an initial response to your Issue from the team within 5 business days. Note that this response may be delayed during holiday periods. For urgent, production-affecting issues please raise a support ticket via the Azure Portal.' }); + github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Thank you for submitting an Issue to the Azure Sentinel GitHub repo! You should expect an initial response to your Issue from the team within 5 business days. Note that this response may be delayed during holiday periods. For urgent, production-affecting issues please raise a support ticket via the Azure Portal.' + }); From 5a4097599b8c7aaa2a0b45670e7e4d77ef9c6354 Mon Sep 17 00:00:00 2001 From: v-amolpatil Date: Mon, 5 Feb 2024 15:24:37 +0530 Subject: [PATCH 6/8] updated checkout version to remove warning on node16 --- .github/workflows/arm-ttk-validations.yaml | 2 +- .github/workflows/checkPRContentChange.yaml | 2 +- .github/workflows/checkSkipPackagingInfo.yaml | 2 +- .github/workflows/getSolutionName.yaml | 2 +- .github/workflows/neworexistingsolution.yaml | 2 +- .github/workflows/package-command.yaml | 2 +- .github/workflows/package-on-fork.yaml | 2 +- .github/workflows/package-on-merge.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/arm-ttk-validations.yaml b/.github/workflows/arm-ttk-validations.yaml index 1aded51a98f..8723e99bb20 100644 --- a/.github/workflows/arm-ttk-validations.yaml +++ b/.github/workflows/arm-ttk-validations.yaml @@ -10,7 +10,7 @@ jobs: mainTemplateChanged: ${{ steps.step1.outputs.mainTemplateChanged }} createUiChanged: ${{ steps.step1.outputs.createUiChanged }} steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 0 - shell: pwsh diff --git a/.github/workflows/checkPRContentChange.yaml b/.github/workflows/checkPRContentChange.yaml index bd531286ee2..d042811ac60 100644 --- a/.github/workflows/checkPRContentChange.yaml +++ b/.github/workflows/checkPRContentChange.yaml @@ -26,7 +26,7 @@ jobs: outputs: hasContentPackageChange: ${{ steps.changesInPR.outputs.hasContentPackageChange }} steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 2 ref: "${{ env.BRANCH_NAME }}" diff --git a/.github/workflows/checkSkipPackagingInfo.yaml b/.github/workflows/checkSkipPackagingInfo.yaml index 5e759884a1a..411e208e2f2 100644 --- a/.github/workflows/checkSkipPackagingInfo.yaml +++ b/.github/workflows/checkSkipPackagingInfo.yaml @@ -22,7 +22,7 @@ jobs: outputs: isPackagingRequired: ${{ steps.getPackagingSkipStatus.outputs.isPackagingRequired }} steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 2 ref: "${{ env.BRANCH_NAME }}" diff --git a/.github/workflows/getSolutionName.yaml b/.github/workflows/getSolutionName.yaml index 0f1843d436e..9bed68070ea 100644 --- a/.github/workflows/getSolutionName.yaml +++ b/.github/workflows/getSolutionName.yaml @@ -17,7 +17,7 @@ jobs: outputs: sName: "${{ steps.getSolutionName.outputs.solutionName }}" steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 2 ref: "${{ env.BRANCH_NAME }}" diff --git a/.github/workflows/neworexistingsolution.yaml b/.github/workflows/neworexistingsolution.yaml index 75992944384..735024c21a7 100644 --- a/.github/workflows/neworexistingsolution.yaml +++ b/.github/workflows/neworexistingsolution.yaml @@ -29,7 +29,7 @@ jobs: solutionOfferId: "${{ steps.IdentifyNewOrExistingSolution.outputs.solutionOfferId }}" solutionPublisherId: "${{ steps.IdentifyNewOrExistingSolution.outputs.solutionPublisherId }}" steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 2 ref: ${{ env.BRANCH_NAME }} diff --git a/.github/workflows/package-command.yaml b/.github/workflows/package-command.yaml index 633e10bd06e..cae13a32b6a 100644 --- a/.github/workflows/package-command.yaml +++ b/.github/workflows/package-command.yaml @@ -27,7 +27,7 @@ jobs: app-id: ${{ env.GITHUB_APPS_ID }} private-key: ${{ env.GITHUB_APPS_KEY }} - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 env: GeneratedToken: ${{ steps.generate_token.outputs.token }} with: diff --git a/.github/workflows/package-on-fork.yaml b/.github/workflows/package-on-fork.yaml index 505dccc16e1..179eb205b50 100644 --- a/.github/workflows/package-on-fork.yaml +++ b/.github/workflows/package-on-fork.yaml @@ -30,7 +30,7 @@ jobs: app-id: ${{ env.GITHUB_APPS_ID }} private-key: ${{ env.GITHUB_APPS_KEY }} - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 env: GeneratedToken: ${{ steps.generate_token.outputs.token }} with: diff --git a/.github/workflows/package-on-merge.yaml b/.github/workflows/package-on-merge.yaml index 317b25eb834..1dbeb1d67ad 100644 --- a/.github/workflows/package-on-merge.yaml +++ b/.github/workflows/package-on-merge.yaml @@ -29,7 +29,7 @@ jobs: app-id: ${{ env.GITHUB_APPS_ID }} private-key: ${{ env.GITHUB_APPS_KEY }} - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 env: GeneratedToken: ${{ steps.generate_token.outputs.token }} with: From f8c0ae3d28ed89ab455b1034e844569f9ff61382 Mon Sep 17 00:00:00 2001 From: v-amolpatil Date: Mon, 5 Feb 2024 15:30:15 +0530 Subject: [PATCH 7/8] Update IssueComment.yml --- .github/workflows/IssueComment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/IssueComment.yml b/.github/workflows/IssueComment.yml index e81eb17d0a3..8e92ab8b0cd 100644 --- a/.github/workflows/IssueComment.yml +++ b/.github/workflows/IssueComment.yml @@ -22,7 +22,6 @@ jobs: - uses: actions/github-script@b7fb2001b410c9390cbe9e2c7d5cab7eefb7b29c env: APPTOKEN: ${{ steps.generate_token.outputs.token }} - githubToken: ${{ secrets.GITHUB_TOKEN }} with: github-token: ${{ env.APPTOKEN }} script: | From f5e87c2d8f6d71761c2ad38c4532e60820017bfe Mon Sep 17 00:00:00 2001 From: v-amolpatil Date: Mon, 5 Feb 2024 15:34:10 +0530 Subject: [PATCH 8/8] minor change --- .github/workflows/package-command.yaml | 2 +- .github/workflows/package-on-merge.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package-command.yaml b/.github/workflows/package-command.yaml index cae13a32b6a..810793d9b8a 100644 --- a/.github/workflows/package-command.yaml +++ b/.github/workflows/package-command.yaml @@ -45,7 +45,7 @@ jobs: $pullRequestBranchName = "$env:BranchName" Write-Host "Pull Request Branch Name is $pullRequestBranchName" $isAutomatedPR = $false - if ($pullRequestBranchName -like '*automated-pr' -or $pullRequestBranchName -like '*dependabot/*') + if ($pullRequestBranchName -like '*automated-pr') { Write-Host "Skipping packaging as it is an automated pr!" $isAutomatedPR = $true diff --git a/.github/workflows/package-on-merge.yaml b/.github/workflows/package-on-merge.yaml index 1dbeb1d67ad..49c0763e83b 100644 --- a/.github/workflows/package-on-merge.yaml +++ b/.github/workflows/package-on-merge.yaml @@ -101,7 +101,7 @@ jobs: - name: createNewPR id: createNewPR - if: ${{ success() && steps.validateAndCreatePackage.outcome == 'success' }} + if: ${{ success() && steps.uploadDataFileArtifact.outcome == 'success' }} uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5 env: SOLUTION_NAME: "${{ steps.validateAndCreatePackage.outputs.solutionName }}"