aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-02-16 21:38:37 -0500
committertoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-02-16 21:41:31 -0500
commitf019ab741abdc5ddcb9e5c483d86494c7929d8df (patch)
treeced150ad2f28981088c986d232d46cb91d58f221
parentab2cec04795e1b3b3f3681d6fe609fb1462ee711 (diff)
Update workflow definition
-rw-r--r--.github/workflows/ci.yml23
-rw-r--r--.github/workflows/nodejs.yml24
2 files changed, 23 insertions, 24 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..40bc005d
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Setup node
+ uses: actions/setup-node@v1
+ with:
+ node-version: '12.x'
+ - name: Install dependencies
+ run: npm ci
+ - name: Build
+ run: npm run build --if-present
+ - name: Run tests
+ run: npm test
+ env:
+ CI: true
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
deleted file mode 100644
index 7c800f85..00000000
--- a/.github/workflows/nodejs.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Node.js CI
-
-on: [push]
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- strategy:
- matrix:
- node-version: [10.x, 12.x]
-
- steps:
- - uses: actions/checkout@v2
- - name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v1
- with:
- node-version: ${{ matrix.node-version }}
- - run: npm ci
- - run: npm run build --if-present
- - run: npm test
- env:
- CI: true