Skip to content

Commit

Permalink
Merge pull request #19 from disneystreaming/ci-run-main
Browse files Browse the repository at this point in the history
Run CI on main, run tests on non-PRs too
  • Loading branch information
daddykotex committed May 11, 2023
2 parents 8d9e8da + d882466 commit af1e1e7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
on:
push:
tags: ["v*"]
branches: ["main"]
pull_request:
branches: ["*"]

name: Build and deploy
jobs:
build:
if: github.event_name == 'pull_request'
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build & test
run: yarn ci

Expand All @@ -22,6 +21,7 @@ jobs:

deploy:
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
needs: build
name: Publish
runs-on: ubuntu-latest
steps:
Expand Down

0 comments on commit af1e1e7

Please sign in to comment.