Skip to content

Commit

Permalink
Merge e30eaae into 0ac48f0
Browse files Browse the repository at this point in the history
  • Loading branch information
JoviDeCroock committed Mar 11, 2020
2 parents 0ac48f0 + e30eaae commit 0bb7a77
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 68 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: CI-master

on:
push:
branches:
- master

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- run: npm ci
- run: npm run build

test:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- run: npm ci
- name: test
env:
CI: true
COVERAGE: true
FLAKEY: false
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
run: npm run test
- name: Coveralls GitHub Action
uses: coverallsapp/github-action@v1.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
39 changes: 39 additions & 0 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: CI-PR

on: [pull_request]

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- run: npm ci
- run: npm run build

test:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- uses: actions/setup-node@v1
with:
node-version: '10.x'
- run: npm ci
- name: test
env:
CI: true
COVERAGE: true
FLAKEY: false
run: npm run test
- name: Coveralls GitHub Action
uses: coverallsapp/github-action@v1.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
29 changes: 0 additions & 29 deletions .travis.yml

This file was deleted.

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
[![OpenCollective Backers](https://opencollective.com/preact/backers/badge.svg)](#backers)
[![OpenCollective Sponsors](https://opencollective.com/preact/sponsors/badge.svg)](#sponsors)


[![travis](https://travis-ci.org/preactjs/preact.svg?branch=master)](https://travis-ci.org/preactjs/preact)
[![coveralls](https://img.shields.io/coveralls/preactjs/preact/master.svg)](https://coveralls.io/github/preactjs/preact)
[![gzip size](http://img.badgesize.io/https://unpkg.com/preact/dist/preact.min.js?compression=gzip&label=gzip)](https://unpkg.com/preact/dist/preact.min.js)
[![brotli size](http://img.badgesize.io/https://unpkg.com/preact/dist/preact.min.js?compression=brotli&label=brotli)](https://unpkg.com/preact/dist/preact.min.js)
Expand Down
10 changes: 4 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
var coverage = String(process.env.COVERAGE) === 'true',
minify = String(process.env.MINIFY) === 'true',
ci = String(process.env.CI).match(/^(1|true)$/gi),
pullRequest = !String(process.env.TRAVIS_PULL_REQUEST).match(
/^(0|false|undefined)$/gi
),
masterBranch = String(process.env.TRAVIS_BRANCH).match(/^master$/gi),
pullRequest = String(process.env.GITHUB_EVENT_NAME) === 'pull_request',
masterBranch = String(process.env.GITHUB_WORKFLOW) === 'CI-master',
sauceLabs = ci && !pullRequest && masterBranch,
performance = !coverage && String(process.env.PERFORMANCE) !== 'false',
webpack = require('webpack'),
Expand Down Expand Up @@ -102,9 +100,9 @@ module.exports = function(config) {
captureTimeout: 0,

sauceLabs: {
build: `CI #${process.env.TRAVIS_BUILD_NUMBER} (${process.env.TRAVIS_BUILD_ID})`,
build: `CI #${process.env.GITHUB_RUN_NUMBER} (${process.env.GITHUB_RUN_ID})`,
tunnelIdentifier:
process.env.TRAVIS_JOB_NUMBER ||
process.env.GITHUB_RUN_NUMBER ||
`local${require('./package.json').version}`,
connectLocationForSERelay: 'localhost',
connectPortForSERelay: 4445,
Expand Down
30 changes: 0 additions & 30 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@
"prop-types": "^15.7.2",
"sinon": "^6.1.3",
"sinon-chai": "^3.0.0",
"travis-size-report": "^1.0.1",
"typescript": "^3.0.1",
"webpack": "^4.3.0"
}
Expand Down

0 comments on commit 0bb7a77

Please sign in to comment.