summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2020-03-20 02:46:13 +0900
committerGitHub <noreply@github.com>2020-03-20 02:46:13 +0900
commit1b48e0d6e0983840de57973bc8416410fa11e6dc (patch)
tree6e599651fde304e9c607b5d0ffedc2f829f9c57b /.github/workflows
parentUpdate dependencies (#6167) (diff)
downloadsharkey-1b48e0d6e0983840de57973bc8416410fa11e6dc.tar.gz
sharkey-1b48e0d6e0983840de57973bc8416410fa11e6dc.tar.bz2
sharkey-1b48e0d6e0983840de57973bc8416410fa11e6dc.zip
Revert "Update dependencies (#6167)" (#6168)
This reverts commit 0420c548dade2c5b00353b4a5f20606667fc4253.
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/docker.yml18
-rw-r--r--.github/workflows/nodejs.yml45
2 files changed, 56 insertions, 7 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000000..f1c3ef0b66
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,18 @@
+name: Docker build
+on:
+ push:
+ branches:
+ - master
+ - develop
+ pull_request:
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v1
+ - name: Pull previous build result (for cache)
+ run: docker pull misskey/misskey:latest
+ - name: Build docker container
+ run: docker build --cache-from misskey/misskey:latest -t misskey/misskey .
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 4ea86fb391..91668786e2 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,22 +1,53 @@
name: Node.js CI
-
-on: [push]
+on:
+ push:
+ branches:
+ - master
+ - develop
+ pull_request:
jobs:
build_and_test:
-
runs-on: ubuntu-latest
strategy:
matrix:
- node-version: [11.10.x, 12.x, 13.x]
+ node-version: [11.10.x, 12.x]
+
+ services:
+ postgres:
+ image: postgres:10-alpine
+ ports:
+ - 5432:5432
+ env:
+ POSTGRES_DB: test-misskey
+ POSTGRES_HOST_AUTH_METHOD: trust
+ redis:
+ image: redis:alpine
+ ports:
+ - 6379:6379
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
+ - name: Install dependencies
+ run: yarn install
+ - name: Copy Configure
+ run: cp .circleci/misskey/*.yml .config
+ - name: Build
+ run: yarn build
+ - name: Test
+ run: yarn test
+
+ lint:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-node@v1
+ with:
+ node-version: 12.x
- run: yarn install
- - run: cp .circleci/misskey/*.yml .config/
- - run: yarn build
+ - run: yarn lint