Skip to content

Commit

Permalink
Merge pull request #81 from broccolijs/GH-Actions
Browse files Browse the repository at this point in the history
Gh actions
  • Loading branch information
stefanpenner authored Mar 30, 2020
2 parents 04087ba + 0fdc371 commit f6a0fb1
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 41 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: CI

on:
push:
branches:
- master
- 'v*' # older version branches
tags:
- '*'
pull_request: {}
schedule:
- cron: '0 6 * * 0' # weekly, on sundays

jobs:
test:
name: Tests
runs-on: ${{ matrix.os }}

strategy:
matrix:
node: ['10', '12']
os: [ubuntu-latest, macOS-latest, windows-latest]

steps:
- uses: actions/checkout@v1
- uses: volta-cli/action@v1
with:
node-version: ${{ matrix.node }}
- name: install dependencies
run: yarn
- name: test
run: yarn test
5 changes: 0 additions & 5 deletions .travis.yml

This file was deleted.

4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# broccoli-merge-trees

[![Build Status](https://travis-ci.org/broccolijs/broccoli-merge-trees.svg?branch=master)](https://travis-ci.org/broccolijs/broccoli-merge-trees)
[![Build status](https://ci.appveyor.com/api/projects/status/9fkvegf4qbvfsg5v?svg=true)](https://ci.appveyor.com/project/embercli/broccoli-merge-trees)
![CI](https://github.com/broccolijs/broccoli-merge-trees/workflows/CI/badge.svg![CI](https://github.com/broccolijs/broccoli-merge-trees/workflows/CI/badge.svg))

Copy multiple trees of files on top of each other, resulting in a single merged tree.

Expand Down
33 changes: 0 additions & 33 deletions appveyor.yml

This file was deleted.

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,9 @@
"scripts": {
"test": "mocha",
"test:debug": "mocha debug"
},
"volta": {
"node": "12.16.1",
"yarn": "1.22.4"
}
}

0 comments on commit f6a0fb1

Please sign in to comment.