forked from misskey-dev/misskey
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into folding2
- Loading branch information
Showing
350 changed files
with
10,566 additions
and
6,910 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,11 @@ | ||
# misskey settings | ||
# MISSKEY_URL=https://example.tld/ | ||
|
||
# db settings | ||
POSTGRES_PASSWORD=example-misskey-pass | ||
# DATABASE_PASSWORD=${POSTGRES_PASSWORD} | ||
POSTGRES_USER=example-misskey-user | ||
# DATABASE_USER=${POSTGRES_USER} | ||
POSTGRES_DB=misskey | ||
# DATABASE_DB=${POSTGRES_DB} | ||
DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,10 +4,11 @@ on: | |
push: | ||
paths: | ||
- packages/misskey-js/** | ||
- .github/workflows/api-misskey-js.yml | ||
pull_request: | ||
paths: | ||
- packages/misskey-js/** | ||
|
||
- .github/workflows/api-misskey-js.yml | ||
jobs: | ||
report: | ||
|
||
|
@@ -20,7 +21,7 @@ jobs: | |
- run: corepack enable | ||
|
||
- name: Setup Node.js | ||
uses: actions/[email protected].2 | ||
uses: actions/[email protected].3 | ||
with: | ||
node-version-file: '.node-version' | ||
cache: 'pnpm' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ jobs: | |
- name: Checkout head | ||
uses: actions/[email protected] | ||
- name: Setup Node.js | ||
uses: actions/[email protected].2 | ||
uses: actions/[email protected].3 | ||
with: | ||
node-version-file: '.node-version' | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,7 +28,7 @@ jobs: | |
|
||
- name: setup node | ||
id: setup-node | ||
uses: actions/[email protected].2 | ||
uses: actions/[email protected].3 | ||
with: | ||
node-version-file: '.node-version' | ||
cache: pnpm | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,14 +13,16 @@ jobs: | |
runs-on: ubuntu-latest | ||
env: | ||
DOCKER_CONTENT_TRUST: 1 | ||
DOCKLE_VERSION: 0.4.14 | ||
steps: | ||
- uses: actions/[email protected] | ||
- run: | | ||
curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb" | ||
- name: Download and install dockle v${{ env.DOCKLE_VERSION }} | ||
run: | | ||
curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v${DOCKLE_VERSION}/dockle_${DOCKLE_VERSION}_Linux-64bit.deb" | ||
sudo dpkg -i dockle.deb | ||
- run: | | ||
cp .config/docker_example.env .config/docker.env | ||
cp ./docker-compose_example.yml ./docker-compose.yml | ||
cp ./compose_example.yml ./compose.yml | ||
- run: | | ||
docker compose up -d web | ||
docker tag "$(docker compose images web | awk 'OFS=":" {print $4}' | tail -n +2)" misskey-web:latest | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ on: | |
paths: | ||
- packages/backend/** | ||
- .github/workflows/get-api-diff.yml | ||
|
||
- .github/workflows/get-api-diff.yml | ||
jobs: | ||
get-from-misskey: | ||
runs-on: ubuntu-latest | ||
|
@@ -34,7 +34,7 @@ jobs: | |
- name: Install pnpm | ||
uses: pnpm/action-setup@v4 | ||
- name: Use Node.js ${{ matrix.node-version }} | ||
uses: actions/[email protected].2 | ||
uses: actions/[email protected].3 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
cache: 'pnpm' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,15 +10,16 @@ on: | |
- packages/frontend/** | ||
- packages/sw/** | ||
- packages/misskey-js/** | ||
- packages/shared/.eslintrc.js | ||
- packages/shared/eslint.config.js | ||
- .github/workflows/lint.yml | ||
pull_request: | ||
paths: | ||
- packages/backend/** | ||
- packages/frontend/** | ||
- packages/sw/** | ||
- packages/misskey-js/** | ||
- packages/shared/.eslintrc.js | ||
|
||
- packages/shared/eslint.config.js | ||
- .github/workflows/lint.yml | ||
jobs: | ||
pnpm_install: | ||
runs-on: ubuntu-latest | ||
|
@@ -28,7 +29,7 @@ jobs: | |
fetch-depth: 0 | ||
submodules: true | ||
- uses: pnpm/action-setup@v4 | ||
- uses: actions/[email protected].2 | ||
- uses: actions/[email protected].3 | ||
with: | ||
node-version-file: '.node-version' | ||
cache: 'pnpm' | ||
|
@@ -39,6 +40,8 @@ jobs: | |
needs: [pnpm_install] | ||
runs-on: ubuntu-latest | ||
continue-on-error: true | ||
env: | ||
eslint-cache-version: v1 | ||
strategy: | ||
matrix: | ||
workspace: | ||
|
@@ -52,13 +55,20 @@ jobs: | |
fetch-depth: 0 | ||
submodules: true | ||
- uses: pnpm/action-setup@v4 | ||
- uses: actions/[email protected].2 | ||
- uses: actions/[email protected].3 | ||
with: | ||
node-version-file: '.node-version' | ||
cache: 'pnpm' | ||
- run: corepack enable | ||
- run: pnpm i --frozen-lockfile | ||
- run: pnpm --filter ${{ matrix.workspace }} run eslint | ||
- name: Restore eslint cache | ||
uses: actions/[email protected] | ||
with: | ||
path: node_modules/.cache/eslint | ||
key: eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }} | ||
restore-keys: | | ||
eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}- | ||
- run: pnpm --filter ${{ matrix.workspace }} run eslint --cache --cache-location node_modules/.cache/eslint --cache-strategy content | ||
|
||
typecheck: | ||
needs: [pnpm_install] | ||
|
@@ -75,7 +85,7 @@ jobs: | |
fetch-depth: 0 | ||
submodules: true | ||
- uses: pnpm/action-setup@v4 | ||
- uses: actions/[email protected].2 | ||
- uses: actions/[email protected].3 | ||
with: | ||
node-version-file: '.node-version' | ||
cache: 'pnpm' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,10 +4,11 @@ on: | |
push: | ||
paths: | ||
- locales/** | ||
- .github/workflows/locale.yml | ||
pull_request: | ||
paths: | ||
- locales/** | ||
|
||
- .github/workflows/locale.yml | ||
jobs: | ||
locale_verify: | ||
runs-on: ubuntu-latest | ||
|
@@ -18,7 +19,7 @@ jobs: | |
fetch-depth: 0 | ||
submodules: true | ||
- uses: pnpm/action-setup@v4 | ||
- uses: actions/[email protected].2 | ||
- uses: actions/[email protected].3 | ||
with: | ||
node-version-file: '.node-version' | ||
cache: 'pnpm' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,7 @@ jobs: | |
- name: Install pnpm | ||
uses: pnpm/action-setup@v4 | ||
- name: Use Node.js ${{ matrix.node-version }} | ||
uses: actions/[email protected].2 | ||
uses: actions/[email protected].3 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
cache: 'pnpm' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.