Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2023.12.2.papi.dev.hotfix.4 #48

Merged
merged 51 commits into from
Jan 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
618e2ba
fix(backend): `drive/files/update`におけるファイル名のバリデーションが機能していない問題を修正 (#12…
zyoshoka Jan 8, 2024
35ec41f
enhance(backend): テストの高速化 (#12939)
samunohito Jan 8, 2024
5dcd8c8
Update CHANGELOG.md (項目の順番の修正)
kakkokari-gtyih Jan 8, 2024
64de874
Update CHANGELOG.md (#12949)
FineArchs Jan 8, 2024
0f9e3bc
refactor(CI): 修正範囲と関係ないActionsが走るのを抑止する (#12918)
samunohito Jan 8, 2024
752c63c
fix: 管理側の分割やめる
n1lsqn Jan 8, 2024
34088ec
feat(ci): api.jsonのバリデーションチェックCIを追加 (#12950)
samunohito Jan 8, 2024
0d7f930
enhance(frontend): バブルゲームの諸々を修正・改良2 (#12948)
kakkokari-gtyih Jan 9, 2024
14aedc1
update sound
syuilo Jan 9, 2024
db55c70
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
n1lsqn Jan 9, 2024
1063d39
enhnace(frontend): tweak game
syuilo Jan 9, 2024
358dc62
Enhance(frontend): 管理者の場合はAPI tokenの発行画面で管理機能に関する権限を付与できるように (#12944)
camilla-ett Jan 9, 2024
1752741
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
n1lsqn Jan 9, 2024
7e52ea4
Update CHANGELOG.md (#12953)
FineArchs Jan 9, 2024
f5b864d
fix(frontend): fix game replay
syuilo Jan 9, 2024
6bae440
bump aiscript version to 0.17.0 (#12955)
FineArchs Jan 10, 2024
138a248
fix(drop-and-fusion): バブルゲームのリトライボタンでリトライができない問題を修正 (#12957)
u1-liquid Jan 10, 2024
3d9e42e
enhance(drop-and-fusion): リプレイの倍速再生対応
syuilo Jan 10, 2024
4bd9f66
enhance(drop-and-fusion): some tweaks
syuilo Jan 10, 2024
c1c363b
Enhance(frontend): 絵文字ピッカー/オートコンプリートで完全一致の絵文字を優先するように (#12928)
1STEP621 Jan 10, 2024
5c786ca
enhance(drop-and-fusion): add game description
syuilo Jan 10, 2024
36fd7d1
enhance(drop-and-fusion): some tweaks
syuilo Jan 10, 2024
89cbe6f
feat: add update.sh
n1lsqn Jan 10, 2024
762fa6a
enhance(drop-and-fusion): make game engine headless for server-side r…
syuilo Jan 11, 2024
cf54c2b
feat: ranking system of bubble game
syuilo Jan 11, 2024
be57ff4
run `pnpm build-misskey-js-with-types` (#12972)
kakkokari-gtyih Jan 11, 2024
d2063df
enhance(drop-and-fusion): add new mode, some tweaks
syuilo Jan 12, 2024
a5ea7c9
chore(drop-and-fusion): bump version
syuilo Jan 12, 2024
1aeede9
refactor(frontend): `activity.heatmap.vue`をコンポーネントに置換 (#12967)
zyoshoka Jan 12, 2024
b920435
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
syuilo Jan 12, 2024
c2a9a7b
enhance(drop-and-fusion): tweak sounds
syuilo Jan 12, 2024
2714073
chore(drop-and-fusion): tweak sounds
syuilo Jan 12, 2024
0aefebf
enhance(drop-and-fusion): some tweaks
syuilo Jan 12, 2024
5672ead
Update 10000yen.png
syuilo Jan 12, 2024
87ffc67
enhance(drop-and-fusion): yenモードで生涯で稼いだ額を記録するように
syuilo Jan 12, 2024
cea7a3e
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
n1lsqn Jan 12, 2024
c6e8f51
chore: version
n1lsqn Jan 12, 2024
e2a7ef4
fix: ci通す
n1lsqn Jan 12, 2024
c603383
fix: ci通す
n1lsqn Jan 12, 2024
439ed21
feat: テストいくつかコメントアウト(チャンネル機能弄ってるため)
n1lsqn Jan 12, 2024
461e94f
fix: コメントアウト
n1lsqn Jan 12, 2024
7873419
Merge tag '2023.12.2.papi.dev.2.hotfix.3' of https://github.com/n1lsq…
n1lsqn Jan 14, 2024
047123a
chore: bump version
n1lsqn Jan 14, 2024
9065d92
feat: もっとやナビゲーションバーに追加できるようにする
n1lsqn Jan 14, 2024
3de7232
feat: クリッカー追加
n1lsqn Jan 14, 2024
bba8f18
feat: チャンネル弾く
n1lsqn Jan 15, 2024
3ad81e6
feat: 文字数制限を緩和
n1lsqn Jan 17, 2024
313d920
fix: TL見えなくする
n1lsqn Jan 20, 2024
1cb8510
feat: 見えなくしちゃう
n1lsqn Jan 21, 2024
e306c89
feat: もっとにカスタム絵文字の管理含める
n1lsqn Jan 21, 2024
13f2104
feat: div追加
n1lsqn Jan 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/api-misskey-js.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: API report (misskey.js)

on: [push, pull_request]
on:
push:
paths:
- packages/misskey-js/**
pull_request:
paths:
- packages/misskey-js/**

jobs:
report:
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/changelog-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Check the description in CHANGELOG.md

on:
pull_request:
branches:
- master
- develop

jobs:
check-changelog:
runs-on: ubuntu-latest

steps:
- name: Checkout head
uses: actions/checkout@v4.1.1
- name: Setup Node.js
uses: actions/setup-node@v4.0.1
with:
node-version-file: '.node-version'

- name: Checkout base
run: |
mkdir _base
cp -r .git _base/.git
cd _base
git fetch --depth 1 origin ${{ github.base_ref }}
git checkout origin/${{ github.base_ref }} CHANGELOG.md

- name: Copy to Checker directory for CHANGELOG-base.md
run: cp _base/CHANGELOG.md scripts/changelog-checker/CHANGELOG-base.md
- name: Copy to Checker directory for CHANGELOG-head.md
run: cp CHANGELOG.md scripts/changelog-checker/CHANGELOG-head.md
- name: diff
continue-on-error: true
run: diff -u CHANGELOG-base.md CHANGELOG-head.md
working-directory: scripts/changelog-checker

- name: Setup Checker
run: npm install
working-directory: scripts/changelog-checker
- name: Run Checker
run: npm run run
working-directory: scripts/changelog-checker
127 changes: 127 additions & 0 deletions .github/workflows/check-misskey-js-autogen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
name: Check Misskey JS autogen

on:
pull_request:
branches:
- master
- develop
paths:
- packages/backend/**

jobs:
check-misskey-js-autogen:
runs-on: ubuntu-latest
permissions:
pull-requests: write

env:
api_json_names: "api-base.json api-head.json"

steps:
- name: checkout
uses: actions/checkout@v4
with:
submodules: true

- name: setup pnpm
uses: pnpm/action-setup@v2
with:
version: 8

- name: setup node
id: setup-node
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: pnpm

- name: install dependencies
run: pnpm i --frozen-lockfile

- name: wait get-api-diff
uses: lewagon/wait-on-check-action@v1.3.3
with:
ref: ${{ github.event.pull_request.head.sha }}
check-regexp: get-from-misskey .+
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 30

- name: Download artifact
uses: actions/github-script@v7
with:
script: |
const fs = require('fs');

const workflows = await github.rest.actions.listWorkflowRunsForRepo({
owner: context.repo.owner,
repo: context.repo.repo,
head_sha: `${{ github.event.pull_request.head.sha }}`
}).then(x => x.data.workflow_runs);

console.log(workflows.map(x => ({name: x.name, title: x.display_title})));

const run_id = workflows.find(x => x.name.includes("Get api.json from Misskey")).id;

let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: run_id,
});

let matchArtifacts = allArtifacts.data.artifacts.filter((artifact) => {
return artifact.name.startsWith("api-artifact-") || artifact.name == "api-artifact"
});

await Promise.all(matchArtifacts.map(async (artifact) => {
let download = await github.rest.actions.downloadArtifact({
owner: context.repo.owner,
repo: context.repo.repo,
artifact_id: artifact.id,
archive_format: 'zip',
});
await fs.promises.writeFile(`${process.env.GITHUB_WORKSPACE}/${artifact.name}.zip`, Buffer.from(download.data));
}));

- name: unzip artifacts
run: |-
find . -mindepth 1 -maxdepth 1 -type f -name '*.zip' -exec unzip {} -d . ';'
ls -la

- name: build autogen
run: |-
for name in $(echo $api_json_names)
do
checksum=$(mktemp)
mv $name packages/misskey-js/generator/api.json

cd packages/misskey-js/generator
pnpm run generate
find built -type f -exec sh -c 'echo $(sed -E "s/^\s+\*\s+generatedAt:.+$//" {} | sha256sum | cut -d" " -f 1) {}' \; > $checksum
cd ../../..
cp $checksum ${name}_checksum
done

- name: check update for type definitions
run: diff $(echo -n ${api_json_names} | awk -v RS=" " '{ printf "%s_checksum ", $0 }')

- name: send message
if: failure()
uses: thollander/actions-comment-pull-request@v2
with:
comment_tag: check-misskey-js-autogen
message: |-
Thank you for sending us a great Pull Request! 👍
Please regenerate misskey-js type definitions! 🙏

example:
```sh
pnpm run build-misskey-js-with-types
```

- name: send message
if: success()
uses: thollander/actions-comment-pull-request@v2
with:
comment_tag: check-misskey-js-autogen
mode: delete
message: "Thank you!"
12 changes: 12 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,19 @@ on:
branches:
- master
- develop
paths:
- packages/backend/**
- packages/frontend/**
- packages/sw/**
- packages/misskey-js/**
- packages/shared/.eslintrc.js
pull_request:
paths:
- packages/backend/**
- packages/frontend/**
- packages/sw/**
- packages/misskey-js/**
- packages/shared/.eslintrc.js

jobs:
pnpm_install:
Expand Down
64 changes: 61 additions & 3 deletions .github/workflows/test-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@ on:
branches:
- master
- develop
paths:
- packages/backend/**
# for permissions
- packages/misskey-js/**
pull_request:
paths:
- packages/backend/**
# for permissions
- packages/misskey-js/**

jobs:
jest:
unit:
runs-on: ubuntu-latest

strategy:
Expand Down Expand Up @@ -51,9 +59,59 @@ jobs:
- name: Build
run: pnpm build
- name: Test
run: pnpm jest-and-coverage
- name: Upload Coverage
run: pnpm --filter backend test-and-coverage
- name: Upload to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/backend/coverage/coverage-final.json

e2e:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.10.0]

services:
postgres:
image: postgres:15
ports:
- 54312:5432
env:
POSTGRES_DB: test-misskey
POSTGRES_HOST_AUTH_METHOD: trust
redis:
image: redis:7
ports:
- 56312:6379

steps:
- uses: actions/checkout@v4.1.1
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@v4.0.1
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
- name: Build
run: pnpm build
- name: Test
run: pnpm --filter backend test-and-coverage:e2e
- name: Upload to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./packages/backend/coverage/coverage-final.json
13 changes: 13 additions & 0 deletions .github/workflows/test-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,20 @@ on:
branches:
- master
- develop
paths:
- packages/frontend/**
# for permissions
- packages/misskey-js/**
# for e2e
- packages/backend/**

pull_request:
paths:
- packages/frontend/**
# for permissions
- packages/misskey-js/**
# for e2e
- packages/backend/**

jobs:
vitest:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test-misskey-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ name: Test (misskey.js)
on:
push:
branches: [ develop ]
paths:
- packages/misskey-js/**
pull_request:
branches: [ develop ]
paths:
- packages/misskey-js/**

jobs:
test:
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/validate-api-json.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Test (backend)

on:
push:
branches:
- master
- develop
paths:
- packages/backend/**
pull_request:
paths:
- packages/backend/**

jobs:
validate-api-json:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.10.0]

steps:
- uses: actions/checkout@v4.1.1
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@v4.0.1
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
- name: Install Redocly CLI
run: npm i -g @redocly/cli
- 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 .config/example.yml .config/default.yml
- name: Build and generate
run: pnpm build && pnpm --filter backend generate-api-json
- name: Validation
run: npx @redocly/cli lint --extends=minimal ./packages/backend/built/api.json
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ docker-compose.yml
# misskey
/build
built
built-test
/data
/.cache-loader
/db
Expand Down
Loading
Loading