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: [PATCH] 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 ++++++------------------------------ package.json | 4 ++-- src/prelude/time.ts | 2 +- yarn.lock | 19 +++++++-------- 5 files changed, 20 insertions(+), 68 deletions(-) delete mode 100644 .github/workflows/docker.yml 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 diff --git a/package.json b/package.json index fa66bdcf64..3d5964124a 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "os-utils": "0.0.14", "parse5": "5.1.1", "parsimmon": "1.13.0", - "pg": "7.18.1", + "pg": "7.18.2", "portal-vue": "2.1.7", "portscanner": "2.2.0", "postcss-loader": "3.0.0", @@ -232,7 +232,7 @@ "ts-node": "8.6.2", "tslint": "6.0.0", "tslint-sonarts": "1.9.0", - "typeorm": "0.2.22", + "typeorm": "0.2.24", "typescript": "3.7.5", "ulid": "2.3.0", "url-loader": "3.0.0", diff --git a/src/prelude/time.ts b/src/prelude/time.ts index a65366d74a..a3b5a41460 100644 --- a/src/prelude/time.ts +++ b/src/prelude/time.ts @@ -5,7 +5,7 @@ const dateTimeIntervals = { }; export function dateUTC(time: number[]): Date { - return new Date(Date.UTC(...time)); + return new Date(Date.UTC(time[0], time[1], time[2], time[3], time[4], time[5], time[6])); } export function isTimeSame(a: Date, b: Date): boolean { diff --git a/yarn.lock b/yarn.lock index 0f49186132..673022c583 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7276,10 +7276,10 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@7.18.1: - version "7.18.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.1.tgz#67f59c47a99456fcb34f9fe53662b79d4a992f6d" - integrity sha512-1KtKBKg/zWrjEEv//klBbVOPGucuc7HHeJf6OEMueVcUeyF3yueHf+DvhVwBjIAe9/97RAydO/lWjkcMwssuEw== +pg@7.18.2: + version "7.18.2" + resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.2.tgz#4e219f05a00aff4db6aab1ba02f28ffa4513b0bb" + integrity sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" @@ -8811,7 +8811,7 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -sha.js@^2.4.0, sha.js@^2.4.8: +sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== @@ -9949,10 +9949,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typeorm@0.2.22: - version "0.2.22" - resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.22.tgz#e85166e29ee4e4248ed73b2b8c977f364ffba606" - integrity sha512-mDEnMtzRwX4zMYbyzM9xDn7jvGs8hfQ2ymOBq36Zxq1RVM642numwlRbr4W8dU7ZYx8CQUE9rmk+sU0baHD9Rw== +typeorm@0.2.24: + version "0.2.24" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.24.tgz#cd0fbd907326873a96c98e290fca49c589f0ffa8" + integrity sha512-L9tQv6nNLRyh+gex/qc8/CyLs8u0kXKqk1OjYGF13k/KOg6N2oibwkuGgv0FuoTGYx2ta2NmqvuMUAMrHIY5ew== dependencies: app-root-path "^3.0.0" buffer "^5.1.0" @@ -9964,6 +9964,7 @@ typeorm@0.2.22: js-yaml "^3.13.1" mkdirp "^0.5.1" reflect-metadata "^0.1.13" + sha.js "^2.4.11" tslib "^1.9.0" xml2js "^0.4.17" yargonaut "^1.1.2"