Skip to content

Commit bd346e5

Browse files
chore(ci): run ci on pull_request and push to master
1 parent 2184613 commit bd346e5

File tree

2 files changed

+22
-36
lines changed

2 files changed

+22
-36
lines changed

Diff for: .github/workflows/ci.yml

+16-28
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,27 @@
1-
name: 'CI: UIRouter for AngularJS'
1+
name: 'CI'
22

3-
on: [push]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
48

59
jobs:
6-
test:
7-
name: Unit Tests
10+
ci:
11+
needs: [test]
812
runs-on: ubuntu-latest
913
steps:
10-
- uses: actions/checkout@v2
11-
- name: Install Dependencies
12-
run: yarn install --pure-lockfile
13-
- name: Run Tests
14-
run: yarn test
14+
- run: true
1515

16-
docs:
17-
name: Docs can be generated
18-
runs-on: ubuntu-latest
19-
steps:
20-
- uses: actions/checkout@v2
21-
- name: Install Dependencies
22-
run: yarn install --pure-lockfile
23-
- name: Generate Docs
24-
run: yarn docs
25-
26-
test_downstream:
27-
name: Downstream projects still work
16+
test:
17+
name: yarn ${{ matrix.yarncmd }}
2818
runs-on: ubuntu-latest
19+
strategy:
20+
matrix:
21+
yarncmd: ['test', 'test:downstream', 'docs']
2922
steps:
3023
- uses: actions/checkout@v2
31-
- name: Prepare to Test Downstream Projects
32-
run: |
33-
npm config set scripts-prepend-node-path auto
34-
git config --global user.email [email protected]
35-
git config --global user.name uirouter_github_actions
3624
- name: Install Dependencies
3725
run: yarn install --pure-lockfile
38-
- name: Test Downstream Projects
39-
run: yarn test:downstream
26+
- name: Run yarn ${{ matrix.yarncmd }}
27+
run: yarn ${{ matrix.yarncmd }}

Diff for: .mergify.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
pull_request_rules:
2-
- name: Automatically squash and merge on CI success
2+
- name: Auto Squash and Merge
33
conditions:
4-
- status-success=Unit Tests
5-
- status-success=Docs can be generated
6-
- status-success=Downstream projects still work
4+
- base=master
5+
- status-success=ci
76
- 'label=ready to squash and merge'
87
actions:
98
delete_head_branch: {}
109
merge:
1110
method: squash
1211
strict: smart
13-
- name: Automatically rebase and merge on CI success
12+
- name: Auto Rebase and Merge
1413
conditions:
15-
- status-success=Unit Tests
16-
- status-success=Docs can be generated
17-
- status-success=Downstream projects still work
14+
- base=master
15+
- status-success=ci
1816
- 'label=ready to rebase and merge'
1917
actions:
2018
delete_head_branch: {}

0 commit comments

Comments
 (0)