Skip to content

Commit ead58d6

Browse files
authored
Merge branch 'develop' into complete-emoji-after-last-colon
2 parents d6ede40 + e2a55e2 commit ead58d6

File tree

448 files changed

+9243
-8275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

448 files changed

+9243
-8275
lines changed

.devcontainer/devcontainer.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"ghcr.io/devcontainers/features/node:1": {
88
"version": "22.11.0"
99
},
10-
"ghcr.io/devcontainers-contrib/features/corepack:1": {}
10+
"ghcr.io/devcontainers-extra/features/corepack:1": {
11+
"version": "0.31.0"
12+
}
1113
},
1214
"forwardPorts": [3000],
1315
"postCreateCommand": "/bin/bash .devcontainer/init.sh",

.github/dependabot.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ updates:
99
directory: "/"
1010
schedule:
1111
interval: daily
12-
open-pull-requests-limit: 100
12+
open-pull-requests-limit: 0
1313

1414
# Add only the root, not each workspace item
1515
# https://github.com/dependabot/dependabot-core/issues/4993#issuecomment-1289133027
1616
- package-ecosystem: npm
1717
directory: "/"
1818
schedule:
1919
interval: daily
20-
open-pull-requests-limit: 10
20+
open-pull-requests-limit: 0
2121
# List dependencies required to be updated together, sharing the same version numbers.
2222
# Those who simply have the common owner (e.g. @fastify) don't need to be listed.
2323
groups:

.github/workflows/api-misskey-js.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,23 @@ on:
99
paths:
1010
- packages/misskey-js/**
1111
- .github/workflows/api-misskey-js.yml
12+
13+
env:
14+
COREPACK_DEFAULT_TO_LATEST: 0
15+
1216
jobs:
1317
report:
1418

1519
runs-on: ubuntu-latest
1620

1721
steps:
1822
- name: Checkout
19-
uses: actions/checkout@v4.1.1
23+
uses: actions/checkout@v4.2.2
2024

2125
- run: corepack enable
2226

2327
- name: Setup Node.js
24-
uses: actions/setup-node@v4.0.4
28+
uses: actions/setup-node@v4.2.0
2529
with:
2630
node-version-file: '.node-version'
2731
cache: 'pnpm'

.github/workflows/changelog-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212

1313
steps:
1414
- name: Checkout head
15-
uses: actions/checkout@v4.1.1
15+
uses: actions/checkout@v4.2.2
1616
- name: Setup Node.js
17-
uses: actions/setup-node@v4.0.4
17+
uses: actions/setup-node@v4.2.0
1818
with:
1919
node-version-file: '.node-version'
2020

.github/workflows/check-misskey-js-autogen.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
1919
steps:
2020
- name: checkout
21-
uses: actions/checkout@v4.1.1
21+
uses: actions/checkout@v4.2.2
2222
with:
2323
submodules: true
2424
persist-credentials: false
@@ -29,7 +29,7 @@ jobs:
2929

3030
- name: setup node
3131
id: setup-node
32-
uses: actions/setup-node@v4.0.4
32+
uses: actions/setup-node@v4.2.0
3333
with:
3434
node-version-file: '.node-version'
3535
cache: pnpm
@@ -66,7 +66,7 @@ jobs:
6666
if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
6767
steps:
6868
- name: checkout
69-
uses: actions/checkout@v4.1.1
69+
uses: actions/checkout@v4.2.2
7070
with:
7171
submodules: true
7272
persist-credentials: false

.github/workflows/check-misskey-js-version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4.1.1
23+
uses: actions/checkout@v4.2.2
2424
- name: Check version
2525
run: |
2626
if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/misskey-js/package.json)" ]; then

.github/workflows/check-spdx-license-id.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4.1.1
15+
uses: actions/checkout@v4.2.2
1616
- name: Check
1717
run: |
1818
counter=0

.github/workflows/check_copyright_year.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check_copyright_year:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4.1.1
13+
- uses: actions/checkout@v4.2.2
1414
- run: |
1515
if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
1616
echo "Please change copyright year!"

.github/workflows/deploy-test-environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
wait_time: ${{ steps.get-wait-time.outputs.wait_time }}
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v4.1.1
31+
uses: actions/checkout@v4.2.2
3232

3333
- name: Check allowed users
3434
id: check-allowed-users

.github/workflows/docker-develop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
platform=${{ matrix.platform }}
2828
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
2929
- name: Check out the repo
30-
uses: actions/checkout@v4.1.1
30+
uses: actions/checkout@v4.2.2
3131
- name: Set up Docker Buildx
3232
uses: docker/setup-buildx-action@v3
3333
- name: Log in to Docker Hub

.github/workflows/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
platform=${{ matrix.platform }}
3333
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
3434
- name: Check out the repo
35-
uses: actions/checkout@v4.1.1
35+
uses: actions/checkout@v4.2.2
3636
- name: Set up Docker Buildx
3737
uses: docker/setup-buildx-action@v3
3838
- name: Docker meta

.github/workflows/dockle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
DOCKER_CONTENT_TRUST: 1
1616
DOCKLE_VERSION: 0.4.14
1717
steps:
18-
- uses: actions/checkout@v4.1.1
18+
- uses: actions/checkout@v4.2.2
1919
- name: Download and install dockle v${{ env.DOCKLE_VERSION }}
2020
run: |
2121
curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v${DOCKLE_VERSION}/dockle_${DOCKLE_VERSION}_Linux-64bit.deb"

.github/workflows/get-api-diff.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
paths:
1010
- packages/backend/**
1111
- .github/workflows/get-api-diff.yml
12+
13+
env:
14+
COREPACK_DEFAULT_TO_LATEST: 0
15+
1216
jobs:
1317
get-from-misskey:
1418
runs-on: ubuntu-latest
@@ -26,14 +30,14 @@ jobs:
2630
ref: refs/pull/${{ github.event.number }}/merge
2731

2832
steps:
29-
- uses: actions/checkout@v4.1.1
33+
- uses: actions/checkout@v4.2.2
3034
with:
3135
ref: ${{ matrix.ref }}
3236
submodules: true
3337
- name: Install pnpm
3438
uses: pnpm/action-setup@v4
3539
- name: Use Node.js ${{ matrix.node-version }}
36-
uses: actions/setup-node@v4.0.4
40+
uses: actions/setup-node@v4.2.0
3741
with:
3842
node-version: ${{ matrix.node-version }}
3943
cache: 'pnpm'

.github/workflows/lint.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,20 @@ on:
2828
- packages/misskey-reversi/**
2929
- packages/shared/eslint.config.js
3030
- .github/workflows/lint.yml
31+
32+
env:
33+
COREPACK_DEFAULT_TO_LATEST: 0
34+
3135
jobs:
3236
pnpm_install:
3337
runs-on: ubuntu-latest
3438
steps:
35-
- uses: actions/checkout@v4.1.1
39+
- uses: actions/checkout@v4.2.2
3640
with:
3741
fetch-depth: 0
3842
submodules: true
3943
- uses: pnpm/action-setup@v4
40-
- uses: actions/setup-node@v4.0.4
44+
- uses: actions/setup-node@v4.2.0
4145
with:
4246
node-version-file: '.node-version'
4347
cache: 'pnpm'
@@ -63,19 +67,19 @@ jobs:
6367
eslint-cache-version: v1
6468
eslint-cache-path: ${{ github.workspace }}/node_modules/.cache/eslint-${{ matrix.workspace }}
6569
steps:
66-
- uses: actions/checkout@v4.1.1
70+
- uses: actions/checkout@v4.2.2
6771
with:
6872
fetch-depth: 0
6973
submodules: true
7074
- uses: pnpm/action-setup@v4
71-
- uses: actions/setup-node@v4.0.4
75+
- uses: actions/setup-node@v4.2.0
7276
with:
7377
node-version-file: '.node-version'
7478
cache: 'pnpm'
7579
- run: corepack enable
7680
- run: pnpm i --frozen-lockfile
7781
- name: Restore eslint cache
78-
uses: actions/cache@v4.1.0
82+
uses: actions/cache@v4.2.0
7983
with:
8084
path: ${{ env.eslint-cache-path }}
8185
key: eslint-${{ env.eslint-cache-version }}-${{ matrix.workspace }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
@@ -93,12 +97,12 @@ jobs:
9397
- sw
9498
- misskey-js
9599
steps:
96-
- uses: actions/checkout@v4.1.1
100+
- uses: actions/checkout@v4.2.2
97101
with:
98102
fetch-depth: 0
99103
submodules: true
100104
- uses: pnpm/action-setup@v4
101-
- uses: actions/setup-node@v4.0.4
105+
- uses: actions/setup-node@v4.2.0
102106
with:
103107
node-version-file: '.node-version'
104108
cache: 'pnpm'

.github/workflows/locale.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,21 @@ on:
99
paths:
1010
- locales/**
1111
- .github/workflows/locale.yml
12+
13+
env:
14+
COREPACK_DEFAULT_TO_LATEST: 0
15+
1216
jobs:
1317
locale_verify:
1418
runs-on: ubuntu-latest
1519
continue-on-error: true
1620
steps:
17-
- uses: actions/checkout@v4.1.1
21+
- uses: actions/checkout@v4.2.2
1822
with:
1923
fetch-depth: 0
2024
submodules: true
2125
- uses: pnpm/action-setup@v4
22-
- uses: actions/setup-node@v4.0.4
26+
- uses: actions/setup-node@v4.2.0
2327
with:
2428
node-version-file: '.node-version'
2529
cache: 'pnpm'

.github/workflows/ok-to-test.yml

-36
This file was deleted.

.github/workflows/on-release-created.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66

77
workflow_dispatch:
88

9+
env:
10+
COREPACK_DEFAULT_TO_LATEST: 0
11+
912
jobs:
1013
publish-misskey-js:
1114
name: Publish misskey-js
@@ -20,13 +23,13 @@ jobs:
2023
node-version: [22.11.0]
2124

2225
steps:
23-
- uses: actions/checkout@v4.1.1
26+
- uses: actions/checkout@v4.2.2
2427
with:
2528
submodules: true
2629
- name: Install pnpm
2730
uses: pnpm/action-setup@v4
2831
- name: Use Node.js ${{ matrix.node-version }}
29-
uses: actions/setup-node@v4.0.4
32+
uses: actions/setup-node@v4.2.0
3033
with:
3134
node-version: ${{ matrix.node-version }}
3235
cache: 'pnpm'

0 commit comments

Comments
 (0)