Merge tag '13.12.1' into merge-upstream

This commit is contained in:
riku6460 2023-05-09 17:45:24 +09:00
commit 0b29445222
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
388 changed files with 12041 additions and 6800 deletions

View file

@ -37,7 +37,10 @@ Please include errors from the developer console and/or server log files if you
## 📌 Environment
<!-- Tell us where on the platform it happens -->
<!-- DO NOT WRITE "latest". Please provide the specific version. -->
Misskey version:
PostgreSQL version:
Redis version:
Your OS:
Your browser:

25
.github/labeler.yml vendored
View file

@ -1,12 +1,21 @@
'Server':
'packages/backend':
- packages/backend/**/*
'🖥Client':
- packages/frontend/**/*
'🧪Test':
- cypress/**/*
'packages/backend:test':
- packages/backend/test/**/*
'‼️ wrong locales':
- any: ['locales/*.yml', '!locales/ja-JP.yml']
'packages/frontend':
- packages/frontend/**/*
'packages/frontend:test':
- cypress/**/*
'packages/sw':
- packages/sw/**/*
'packages/misskey-js':
- packages/misskey-js/**/*
'packages/misskey-js:test':
- packages/misskey-js/test/**/*
- packages/misskey-js/test-d/**/*

View file

@ -19,5 +19,6 @@ https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
## Checklist
- [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md)
- [ ] Test working in a local environment
- [ ] (If needed) Add story of storybook
- [ ] (If needed) Update CHANGELOG.md
- [ ] (If possible) Add tests

View file

@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3.6.0
with:
node-version: 18.x
node-version-file: '.node-version'
cache: 'pnpm'
- name: Install dependencies

View file

@ -17,11 +17,11 @@ jobs:
submodules: true
- uses: pnpm/action-setup@v2
with:
version: 7
version: 8
run_install: false
- uses: actions/setup-node@v3.6.0
with:
node-version: 18.x
node-version-file: '.node-version'
cache: 'pnpm'
- run: corepack enable
- run: pnpm i --frozen-lockfile
@ -48,7 +48,7 @@ jobs:
run_install: false
- uses: actions/setup-node@v3.6.0
with:
node-version: 18.x
node-version-file: '.node-version'
cache: 'pnpm'
- run: corepack enable
- run: pnpm i --frozen-lockfile
@ -74,7 +74,7 @@ jobs:
run_install: false
- uses: actions/setup-node@v3.6.0
with:
node-version: 18.x
node-version-file: '.node-version'
cache: 'pnpm'
- run: corepack enable
- run: pnpm i --frozen-lockfile

View file

@ -35,7 +35,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7
version: 8
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3.6.0

View file

@ -22,7 +22,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7
version: 8
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3.6.0
@ -106,7 +106,7 @@ jobs:
install: false
start: pnpm start:test
wait-on: 'http://localhost:61812'
headless: false
headed: true
browser: ${{ matrix.browser }}
- uses: actions/upload-artifact@v2
if: failure()

42
.github/workflows/test-production.yml vendored Normal file
View file

@ -0,0 +1,42 @@
name: Test (production install and build)
on:
push:
branches:
- master
- develop
pull_request:
env:
NODE_ENV: production
jobs:
production:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3.3.0
with:
submodules: true
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3.6.0
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
- run: corepack enable
- run: pnpm i --frozen-lockfile
- name: Check pnpm-lock.yaml
run: git diff --exit-code pnpm-lock.yaml
- name: Copy Configure
run: cp .github/misskey/test.yml .config/default.yml
- name: Build
run: pnpm build