Skip to content

Commit

Permalink
My change (#525)
Browse files Browse the repository at this point in the history
* Fix expressions 2

* REMO

* REMOVE_ME remove checks
  • Loading branch information
oxve committed Sep 22, 2023
1 parent 1c19a5a commit 0f16a89
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/label-cherry-pick.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ jobs:
runs-on: ubuntu-latest
needs: prepare_branch_list
if: |
needs.prepare_branch_list.outputs.target_branch != '[]' &&
github.event.pull_request.merged == true &&
github.event.pull_request.merge_commit_sha != null
needs.prepare_branch_list.outputs.target_branch != '[]'
strategy:
matrix:
target_branch: ${{ fromJson(needs.prepare_branch_list.outputs.target_branch) }}
Expand All @@ -72,6 +70,7 @@ jobs:
- name: Cherry pick merge commit
id: cherry-pick
continue-on-error: true
run: |
set -e
git fetch origin ${{ matrix.target_branch }}
Expand All @@ -81,7 +80,6 @@ jobs:
- name: Create Pull Request
id: create-pr
if: always()
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
with:
token: ${{ secrets.CHERRY_PICK_TOKEN }}
Expand All @@ -96,7 +94,7 @@ jobs:
${{ github.event.pull_request.body }}
- name: PR Comment
if: failure() && steps.create-pr.outputs.pull-request-number
if: ${{ success() && steps.cherry-pick.outcome == 'failure' }}
uses: actions/github-script@v2
with:
github-token: ${{ secrets.CHERRY_PICK_TOKEN }}
Expand Down

0 comments on commit 0f16a89

Please sign in to comment.