Skip to content

Commit

Permalink
Add push event trigger and merge simulation for PR workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Matej Almasi committed Dec 9, 2024
1 parent 887e966 commit 4078a12
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/pr-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
pull_request:
branches:
- main
push:
branches:
- main

env:
CARGO_TERM_COLOR: always
Expand Down Expand Up @@ -33,6 +36,12 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Merge PR branch into main
if: ${{ github.event_name == 'pull_request'}}
run: |
git fetch origin ${{ github.event.pull_request.head.ref }}
git merge FETCH_HEAD -m "CI Merge Simulation"
- name: Set up Rust
uses: actions-rust-lang/setup-rust-toolchain@v1

Expand Down

0 comments on commit 4078a12

Please sign in to comment.