Skip to content

Commit 7d70733

Browse files
authored
Merge pull request #133 from rollbar/ci
Fixed v2 and v4 scheduled CI checks out master branch
2 parents d7647ff + 20f15f5 commit 7d70733

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

.github/workflows/ci-2.x.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,15 @@ jobs:
4242
name: Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }} (${{ matrix.os }})
4343
runs-on: ${{ matrix.os }}-latest
4444
steps:
45-
- name: Checkout the code
45+
- name: Checkout the PR Branch
4646
uses: actions/checkout@v2
47+
if: ${{ github.event_name == 'pull_request' }}
48+
49+
- name: Checkout the v2 Branch
50+
uses: actions/checkout@v2
51+
# Set the branch to our version branch not master when scheduled.
52+
ref: 'next/2.x/main'
53+
if: ${{ github.event_name == 'schedule' }}
4754

4855
- name: Install PHP and composer environment
4956
uses: shivammathur/setup-php@v2

.github/workflows/ci-4.x.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,15 @@ jobs:
4242
name: Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }} (${{ matrix.os }})
4343
runs-on: ${{ matrix.os }}-latest
4444
steps:
45-
- name: Checkout the code
45+
- name: Checkout the PR Branch
4646
uses: actions/checkout@v2
47+
if: ${{ github.event_name == 'pull_request' }}
48+
49+
- name: Checkout the v4 Branch
50+
uses: actions/checkout@v2
51+
# Set the branch to our version branch not master when scheduled.
52+
ref: 'next/4.x/main'
53+
if: ${{ github.event_name == 'schedule' }}
4754

4855
- name: Install PHP and composer environment
4956
uses: shivammathur/setup-php@v2

0 commit comments

Comments
 (0)