-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[6.15.z] Sync requirements with master branch (#17527)
Signed-off-by: Gaurav Talreja <[email protected]>
- Loading branch information
1 parent
b8e1fe3
commit 37e4f3c
Showing
3 changed files
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,7 +40,7 @@ jobs: | |
- name: Wait for other status checks to Pass | ||
id: waitforstatuschecks | ||
uses: lewagon/[email protected].3 | ||
uses: lewagon/[email protected].4 | ||
with: | ||
ref: ${{ github.head_ref }} | ||
repo-token: ${{ secrets.CHERRYPICK_PAT }} | ||
|
@@ -67,7 +67,7 @@ jobs: | |
- id: automerge | ||
name: Auto merge of cherry-picked PRs. | ||
uses: "pascalgn/[email protected].2" | ||
uses: "pascalgn/[email protected].3" | ||
env: | ||
GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}" | ||
MERGE_LABELS: "AutoMerge_Cherry_Picked, Auto_Cherry_Picked" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,7 +37,7 @@ jobs: | |
|
||
- name: Wait for other status checks to Pass | ||
id: waitforstatuschecks | ||
uses: lewagon/[email protected].3 | ||
uses: lewagon/[email protected].4 | ||
with: | ||
ref: ${{ github.head_ref }} | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
@@ -47,7 +47,7 @@ jobs: | |
|
||
- id: automerge | ||
name: Auto merge of dependabot PRs. | ||
uses: "pascalgn/[email protected].2" | ||
uses: "pascalgn/[email protected].3" | ||
env: | ||
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" | ||
MERGE_LABELS: "dependencies" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters