Skip to content

Commit

Permalink
Merge pull request #159 from actions/joshmgross/update-workflows
Browse files Browse the repository at this point in the history
Update workflows
  • Loading branch information
joshmgross committed Jun 28, 2021
2 parents 6723192 + 936c9d9 commit 5fa6e37
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/ci.yml
@@ -1,17 +1,20 @@
name: CI

on:
push: {branches: main}
pull_request: {branches: main}
push:
branches: [main]
pull_request:
branches: [main]

jobs:
ci:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with: {node-version: 13.x}
- uses: actions/cache@v1
- uses: actions/setup-node@v2
with:
node-version: 12
- uses: actions/cache@v2
with:
path: ~/.npm
key: ${{runner.os}}-npm-${{hashFiles('**/package-lock.json')}}
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/integration.yml
@@ -1,8 +1,10 @@
name: Integration

on:
push: {branches: main}
pull_request: {branches: main}
push:
branches: [main]
pull_request:
branches: [main]

jobs:
test-return:
Expand Down Expand Up @@ -39,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
- uses: actions/cache@v2
with:
path: ~/.npm
key: ${{runner.os}}-npm-${{hashFiles('**/package-lock.json')}}
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/licensed.yml
@@ -1,8 +1,10 @@
name: Licensed

on:
push: {branches: main}
pull_request: {branches: main}
push:
branches: [main]
pull_request:
branches: [main]
repository_dispatch:
workflow_dispatch:

Expand All @@ -12,7 +14,7 @@ jobs:
name: Check licenses
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
- uses: actions/cache@v2
with:
path: ~/.npm
key: ${{runner.os}}-npm-${{hashFiles('**/package-lock.json')}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-test.yml
Expand Up @@ -2,7 +2,7 @@ name: Pull Request Test

on:
pull_request:
branches: main
branches: [main]
types: [opened, synchronize]

jobs:
Expand Down

0 comments on commit 5fa6e37

Please sign in to comment.