diff options
| author |   Anil Belur <abelur@linuxfoundation.org> | 2024-03-09 16:27:34 +1000 |
|---|---|---|
| committer | Anil Belur <abelur@linuxfoundation.org> | 2024-03-11 09:10:44 +1000 |
| commit | b1051be0d7faa370e1e78529631b757427aa4b3a (patch) | |
| tree | 649c85422ca3bdaf0838bdf6a332fd09a1f0e04d | |
| parent | 82ba693fa08f374b1131ae27c41ca2c20cb8c83a (diff) | |
- 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.
Issue-ID: CIMAN-33
Change-Id: I64755a659af96f82ef0b5ba95189c789b5a7b01c
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
| -rw-r--r-- | .github/workflows/gerrit-required-verify.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/gerrit-verify.yaml | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/.github/workflows/gerrit-required-verify.yaml b/.github/workflows/gerrit-required-verify.yaml index a6a5adc..a178c94 100644 --- a/.github/workflows/gerrit-required-verify.yaml +++ b/.github/workflows/gerrit-required-verify.yaml @@ -49,7 +49,7 @@ on: concurrency: # yamllint disable-line rule:line-length - group: required-verify-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} + group: required-verify-${{ github.workflow }}-${{ github.event.inputs.GERRIT_BRANCH }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} cancel-in-progress: true jobs: diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml index bf64fea..63a8ad1 100644 --- a/.github/workflows/gerrit-verify.yaml +++ b/.github/workflows/gerrit-verify.yaml @@ -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_BRANCH }}-${{ 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 }} @@ -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" @@ -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" @@ -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 }} |