diff options
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/docker.yml | 18 | ||||
| -rw-r--r-- | .github/workflows/nodejs.yml | 45 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | src/prelude/time.ts | 2 | ||||
| -rw-r--r-- | yarn.lock | 19 |
5 files changed, 68 insertions, 20 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 diff --git a/package.json b/package.json index 3d5964124a..fa66bdcf64 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.2", + "pg": "7.18.1", "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.24", + "typeorm": "0.2.22", "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 a3b5a41460..a65366d74a 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[0], time[1], time[2], time[3], time[4], time[5], time[6])); + return new Date(Date.UTC(...time)); } export function isTimeSame(a: Date, b: Date): boolean { @@ -7276,10 +7276,10 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -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== +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== 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.11, sha.js@^2.4.8: +sha.js@^2.4.0, 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.24: - version "0.2.24" - resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.24.tgz#cd0fbd907326873a96c98e290fca49c589f0ffa8" - integrity sha512-L9tQv6nNLRyh+gex/qc8/CyLs8u0kXKqk1OjYGF13k/KOg6N2oibwkuGgv0FuoTGYx2ta2NmqvuMUAMrHIY5ew== +typeorm@0.2.22: + version "0.2.22" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.22.tgz#e85166e29ee4e4248ed73b2b8c977f364ffba606" + integrity sha512-mDEnMtzRwX4zMYbyzM9xDn7jvGs8hfQ2ymOBq36Zxq1RVM642numwlRbr4W8dU7ZYx8CQUE9rmk+sU0baHD9Rw== dependencies: app-root-path "^3.0.0" buffer "^5.1.0" @@ -9964,7 +9964,6 @@ typeorm@0.2.24: 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" |