From 0420c548dade2c5b00353b4a5f20606667fc4253 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 20 Mar 2020 02:40:35 +0900
Subject: Update dependencies  (#6167)

* Update CI (#11)

* Update nodejs.yml

* Fix time

* no docker

* no CI

* build only

* Update dependencies
---
 .github/workflows/docker.yml | 18 ------------------
 .github/workflows/nodejs.yml | 45 +++++++-------------------------------------
 2 files changed, 7 insertions(+), 56 deletions(-)
 delete mode 100644 .github/workflows/docker.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index f1c3ef0b66..0000000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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 91668786e2..4ea86fb391 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,53 +1,22 @@
 name: Node.js CI
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
+
+on: [push]
 
 jobs:
   build_and_test:
+
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        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
+        node-version: [11.10.x, 12.x, 13.x]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - 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: yarn lint
+    - run: cp .circleci/misskey/*.yml .config/
+    - run: yarn build
-- 
cgit v1.2.3-freya