Skip to content

Commit c393f4f

Browse files
chore(ci): run ci on pull_request and push to master
1 parent 29736a5 commit c393f4f

File tree

2 files changed

+46
-5
lines changed

2 files changed

+46
-5
lines changed

.github/workflows/ci.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: 'CI'
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
ci:
11+
needs: [test]
12+
runs-on: ubuntu-latest
13+
steps:
14+
- run: true
15+
16+
test:
17+
name: yarn ${{ matrix.yarncmd }}
18+
runs-on: ubuntu-latest
19+
strategy:
20+
matrix:
21+
yarncmd: ['build']
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Configure
25+
run: |
26+
npm config set scripts-prepend-node-path auto
27+
git config --global user.email uirouter@github.actions
28+
git config --global user.name uirouter_github_actions
29+
- name: Install Dependencies
30+
run: yarn install --pure-lockfile
31+
- name: Run Tests
32+
run: yarn ${{ matrix.yarncmd }}

.mergify.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
pull_request_rules:
2-
- name: Automatically merge on CI success and review
2+
- name: Auto Squash and Merge
33
conditions:
4-
- status-success=continuous-integration/travis-ci/pr
5-
- 'label=automerge'
4+
- base=master
5+
- status-success=ci
6+
- 'label=ready to squash and merge'
67
actions:
78
delete_head_branch: {}
8-
label:
9-
add: ['auto merged']
109
merge:
1110
method: squash
1211
strict: smart
12+
- name: Auto Rebase and Merge
13+
conditions:
14+
- base=master
15+
- status-success=ci
16+
- 'label=ready to rebase and merge'
17+
actions:
18+
delete_head_branch: {}
19+
merge:
20+
method: rebase
21+
strict: smart

0 commit comments

Comments
 (0)