Skip to content

Commit

Permalink
Merge d5086a3 into 68faca1
Browse files Browse the repository at this point in the history
  • Loading branch information
joe-castle committed Apr 19, 2021
2 parents 68faca1 + d5086a3 commit 1edf029
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 40 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
name: Release

on:
pull_request:
types: [ closed ]
branches: [ master ]
push:
branches:
- master

jobs:
release:
name: Release

runs-on: ubuntu-latest

if: ${{ github.event.pull_request.merged }}

steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test, Build and Report Coverage

on:
push:
branches: [ master, deploy, feature/*, fix/*, release/* ]
branches: [ master, deploy, feature-**, fix-**, release-** ]
pull_request:
branches: [ master, deploy ]

Expand Down Expand Up @@ -31,11 +31,12 @@ jobs:
run: npm run build
- uses: actions/upload-artifact@v2
if: ${{ success() && github.ref == 'refs/heads/master' }}
path: |
dist/**
lib/**
es/**
types/**
with:
path: |
dist/**
lib/**
es/**
types/**
- name: Coveralls report
uses: coverallsapp/github-action@v1.1.2
with:
Expand Down
29 changes: 0 additions & 29 deletions .travis.yml

This file was deleted.

0 comments on commit 1edf029

Please sign in to comment.