Adjust repology workflow, Update actions-label-merge-conflict (#11280)

* Adjust repology workflow.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Update actions-label-merge-conflict

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

---------

Signed-off-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
Satadru Pramanik, DO, MPH, MEng
2025-02-10 12:37:44 -05:00
committed by GitHub
parent 17f83bd118
commit 875e172f40
2 changed files with 7 additions and 6 deletions

View File

@@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.6'
ruby-version: '3.4.1'
- name: Install highline
run: sudo apt install -y ruby-highline
- name: Install activesupport
@@ -39,12 +39,13 @@ jobs:
author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
commit-message: "Update Repology JSON"
delete-branch: true
team-reviewers: chromebrew/active
- name: Trigger Unit Test Workflow & Add Reviewer Team
env:
GH_TOKEN: ${{ secrets.CREW_PR_TOKEN }}
PR_NUMBER: :${{ steps.cpr.outputs.pull-request-number }}
run: |
echo "Flipping pr ${PR_NUMBER} state."
gh pr close ${PR_NUMBER} && gh pr reopen ${PR_NUMBER}
gh pr edit ${PR_NUMBER} --add-reviewer chromebrew/active
gh pr merge ${PR_NUMBER} --auto
gh pr close "${PR_NUMBER}" && gh pr reopen "${PR_NUMBER}"
gh pr edit "${PR_NUMBER}" --add-reviewer chromebrew/active
gh pr merge "${PR_NUMBER}" --auto

View File

@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-24.04
if: ${{ contains(github.repository_owner, 'chromebrew') }}
steps:
- uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
- uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
with:
dirtyLabel: merge conflict
repoToken: ${{ secrets.CREW_PR_TOKEN }}