Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.15.z] - Handle failed workflow cherry-picks #1185

Merged
merged 1 commit into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/auto_cherry_pick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
prt_comment: ${{steps.fc.outputs.comment-body}}
steps:
- name: Find Comment
uses: peter-evans/find-comment@v2
uses: peter-evans/find-comment@v3
id: fc
with:
issue-number: ${{ env.number }}
Expand All @@ -45,7 +45,7 @@ jobs:
with:
swap-size-gb: 10
## Nailgun Repo Checkout
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: ${{ startsWith(matrix.label, '6.') && matrix.label != github.base_ref }}
with:
fetch-depth: 0
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:

- name: is autoMerging enabled for Auto CherryPicked PRs ?
if: ${{ always() && steps.cherrypick.outcome == 'success' && contains(github.event.pull_request.labels.*.name, 'AutoMerge_Cherry_Picked') }}
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.CHERRYPICK_PAT }}
script: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- id: find-prt-comment
name: Find the prt comment
uses: peter-evans/find-comment@v2
uses: peter-evans/find-comment@v3
with:
issue-number: ${{ github.event.number }}
body-includes: "trigger: test-robottelo"
Expand All @@ -45,7 +45,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 }}
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:

- id: automerge
name: Auto merge of cherry-picked PRs.
uses: "pascalgn/automerge-action@v0.15.5"
uses: pascalgn/automerge-action@v0.16.3
if: steps.waitforstatuschecks.outputs.status == 'success'
env:
GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/merge_to_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
python-version: ['3.10', '3.11']
steps:
- name: Checkout Nailgun
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 2

- name: Set Up Python-${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -40,7 +40,7 @@ jobs:
pip install -U -r requirements.txt -r requirements-dev.txt --no-cache-dir

- name: Pre Commit Checks
uses: pre-commit/action@v2.0.0
uses: pre-commit/action@v3.0.1

- name: Make Docs
run: |
Expand All @@ -62,7 +62,7 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Setup python 3.10
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install pypa/build
Expand Down
Loading