Skip to content

Commit

Permalink
CI: Update GHA .github workflows
Browse files Browse the repository at this point in the history
- Update to latest version of lfit/gerrit-review-action
- Update to latest version of lfit/checkout-gerrit-change-action
- Prefix gerrit branch to avoid Change-id collisions and jobs getting
  cancelled for cherry picked across branches.

Change-Id: I3dbbfede31d10aa6289226c635b36d1e807e5ecc
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
  • Loading branch information
askb committed Mar 10, 2024
1 parent 944da62 commit 99c1ef4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/gerrit-required-info-yaml-verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ on:
description: "The target GitHub repository needing the required workflow"
required: true
type: string

concurrency:
# yamllint disable-line rule:line-length
group: required-verify-${{ github.workflow }}-${{ github.event.inputs.GERRIT_BRANCH }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }}
cancel-in-progress: true

jobs:
call-gerrit-required-info-yaml-verify:
# yamllint disable-line rule:line-length
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/gerrit-verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,18 @@ on:
required: true
type: string


concurrency:
group: ${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }}
# yamllint disable-line rule:line-length
group: ${{ github.event.inputs.GERRIT_CHANGE_ID }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }}
cancel-in-progress: true


jobs:
clear-vote:
runs-on: ubuntu-latest
steps:
- name: Clear votes
# yamllint disable-line rule:line-length
uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4
uses: lfit/gerrit-review-action@7c30179c3c9389545fccb0d458df59879372ae6a # v0.6
with:
host: ${{ vars.GERRIT_SERVER }}
username: ${{ vars.GERRIT_SSH_USER }}
Expand All @@ -72,7 +71,7 @@ jobs:
steps:
- name: Checkout change
# yamllint disable-line rule:line-length
uses: lfit/checkout-gerrit-change-action@70360ca2f8bee3e6a15224d8a03f8e017b1ac91f # v0.4
uses: lfit/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63 # v0.9
with:
gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
delay: "0s"
Expand All @@ -92,7 +91,7 @@ jobs:
steps:
- name: Checkout change
# yamllint disable-line rule:line-length
uses: lfit/checkout-gerrit-change-action@70360ca2f8bee3e6a15224d8a03f8e017b1ac91f # v0.4
uses: lfit/checkout-gerrit-change-action@54d751e8bd167bc91f7d665dabe33fae87aaaa63 # v0.9
with:
gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
delay: "0s"
Expand All @@ -112,7 +111,7 @@ jobs:
- uses: technote-space/workflow-conclusion-action@v3
- name: Set vote
# yamllint disable-line rule:line-length
uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4
uses: lfit/gerrit-review-action@7c30179c3c9389545fccb0d458df59879372ae6a # v0.6
with:
host: ${{ vars.GERRIT_SERVER }}
username: ${{ vars.GERRIT_SSH_USER }}
Expand Down

0 comments on commit 99c1ef4

Please sign in to comment.