Skip to content

Commit

Permalink
Merge branch 'kokonect-link:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bil-ash committed Jan 15, 2024
2 parents a391676 + cf9bf6f commit cfa914e
Show file tree
Hide file tree
Showing 924 changed files with 33,043 additions and 15,537 deletions.
1 change: 1 addition & 0 deletions .config/docker_example.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
POSTGRES_PASSWORD=example-cherrypick-pass
POSTGRES_USER=example-cherrypick-user
POSTGRES_DB=cherrypick
DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}"
6 changes: 3 additions & 3 deletions .config/docker_example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ redis:
# โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
#โ”€โ”€โ”€โ”˜ MeiliSearch configuration โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€

# You can set scope to local (default value) or global
# You can set scope to local (default value) or global
# (include notes from remote).

#meilisearch:
Expand Down Expand Up @@ -151,7 +151,7 @@ id: 'aidx'

# Job rate limiter
# deliverJobPerSec: 128
# inboxJobPerSec: 16
# inboxJobPerSec: 32

# Job attempts
# deliverJobMaxAttempts: 12
Expand Down Expand Up @@ -194,7 +194,7 @@ proxyRemoteFiles: true
signToActivityPubGet: true

# For security reasons, uploading attachments from the intranet is prohibited,
# but exceptions can be made from the following settings. Default value is "undefined".
# but exceptions can be made from the following settings. Default value is "undefined".
# Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)).
#allowedPrivateNetworks: [
# '127.0.0.1/32'
Expand Down
2 changes: 1 addition & 1 deletion .config/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ id: 'aidx'

# Job rate limiter
#deliverJobPerSec: 128
#inboxJobPerSec: 16
#inboxJobPerSec: 32
#relashionshipJobPerSec: 64

# Job attempts
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ id: 'aidx'

# Job rate limiter
# deliverJobPerSec: 128
# inboxJobPerSec: 16
# inboxJobPerSec: 32

# Job attempts
# deliverJobMaxAttempts: 12
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/01_bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,9 @@ body:
render: markdown
validations:
required: false

- type: checkboxes
attributes:
label: Do you want to address this bug yourself?
options:
- label: Yes, I will patch the bug myself and send a pull request
7 changes: 6 additions & 1 deletion .github/ISSUE_TEMPLATE/02_feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@ body:
label: Purpose
description: Describe the specific problem or need you think this feature will solve, and who it will help.
validations:
required: true
required: true
- type: checkboxes
attributes:
label: Do you want to implement this feature yourself?
options:
- label: Yes, I will implement this by myself and send a pull request
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/01_bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md
## Checklist
- [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md)
- [ ] Test working in a local environment
- [ ] (If needed) Update CHANGELOG.md
- [ ] (If needed) Update CHANGELOG_CHERRYPICK.md
- [ ] (If possible) Add tests
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/02_enhance.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md
## Checklist
- [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md)
- [ ] Test working in a local environment
- [ ] (If needed) Update CHANGELOG.md
- [ ] (If needed) Update CHANGELOG_CHERRYPICK.md
- [ ] (If possible) Add tests
30 changes: 23 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,32 @@ updates:
directory: "/"
schedule:
interval: daily
# PNPM has an issue with dependabot. See:
# https://github.com/dependabot/dependabot-core/issues/7258
# https://github.com/pnpm/pnpm/issues/6530
# TODO: Restore this when the issue is solved
open-pull-requests-limit: 0
open-pull-requests-limit: 10
# List dependencies required to be updated together, sharing the same version numbers.
# Those who simply have the common owner (e.g. @fastify) don't need to be listed.
groups:
swc:
aws-sdk:
patterns:
- "@swc/*"
- "@aws-sdk/*"
bull-board:
patterns:
- "@bull-board/*"
nestjs:
patterns:
- "@nestjs/*"
slacc:
patterns:
- "slacc-*"
storybook:
patterns:
- "storybook*"
- "@storybook/*"
swc-core:
patterns:
- "@swc/core*"
typescript-eslint:
patterns:
- "@typescript-eslint/*"
tensorflow:
patterns:
- "@tensorflow/*"
29 changes: 21 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
'packages/backend':
- packages/backend/**/*
- any:
- changed-files:
- any-glob-to-any-file: ['packages/backend/**/*']

'packages/backend:test':
- packages/backend/test/**/*
- any:
- changed-files:
- any-glob-to-any-file: ['packages/backend/test/**/*']

'packages/frontend':
- packages/frontend/**/*
- any:
- changed-files:
- any-glob-to-any-file: ['packages/frontend/**/*']

'packages/frontend:test':
- cypress/**/*
- any:
- changed-files:
- any-glob-to-any-file: ['cypress/**/*']

'packages/sw':
- packages/sw/**/*
- any:
- changed-files:
- any-glob-to-any-file: ['packages/sw/**/*']

'packages/cherrypick-js':
- packages/cherrypick-js/**/*
- any:
- changed-files:
- any-glob-to-any-file: ['packages/cherrypick-js/**/*']

'packages/cherrypick-js:test':
- packages/cherrypick-js/test/**/*
- packages/cherrypick-js/test-d/**/*
- any:
- changed-files:
- any-glob-to-any-file: ['packages/cherrypick-js/test/**/*', 'packages/cherrypick-js/test-d/**/*']
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md
## Checklist
- [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md)
- [ ] Test working in a local environment
- [ ] (If needed) Update CHANGELOG.md
- [ ] (If needed) Update CHANGELOG_CHERRYPICK.md
- [ ] (If possible) Add tests
10 changes: 8 additions & 2 deletions .github/workflows/api-cherrypick-js.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: API report (cherrypick.js)

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

jobs:
report:
Expand All @@ -14,7 +20,7 @@ jobs:
- run: corepack enable

- name: Setup Node.js
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version-file: '.node-version'
cache: 'pnpm'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/get-api-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
version: 8
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
Expand All @@ -54,9 +54,9 @@ jobs:
- name: Copy API.json
run: cp packages/backend/built/api.json ${{ matrix.api-json-name }}
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: api-artifact
name: api-artifact-${{ matrix.api-json-name }}
path: ${{ matrix.api-json-name }}

save-pr-number:
Expand All @@ -67,7 +67,7 @@ jobs:
PR_NUMBER: ${{ github.event.number }}
run: |
echo "$PR_NUMBER" > ./pr_number
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: api-artifact
name: api-artifact-pr-number
path: pr_number
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
20 changes: 17 additions & 3 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/cherrypick-js/**
- packages/shared/.eslintrc.js
pull_request:
paths:
- packages/backend/**
- packages/frontend/**
- packages/sw/**
- packages/cherrypick-js/**
- packages/shared/.eslintrc.js

jobs:
pnpm_install:
Expand All @@ -19,7 +31,7 @@ jobs:
with:
version: 8
run_install: false
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version-file: '.node-version'
cache: 'pnpm'
Expand All @@ -46,7 +58,7 @@ jobs:
with:
version: 7
run_install: false
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version-file: '.node-version'
cache: 'pnpm'
Expand All @@ -72,10 +84,12 @@ jobs:
with:
version: 7
run_install: false
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version-file: '.node-version'
cache: 'pnpm'
- run: corepack enable
- run: pnpm i --frozen-lockfile
- run: pnpm --filter cherrypick-js run build
if: ${{ matrix.workspace == 'backend' }}
- run: pnpm --filter ${{ matrix.workspace }} run typecheck
38 changes: 25 additions & 13 deletions .github/workflows/report-api-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,28 @@ jobs:
uses: actions/github-script@v7
with:
script: |
const fs = require('fs');
let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: context.payload.workflow_run.id,
});
let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
return artifact.name == "api-artifact"
})[0];
let download = await github.rest.actions.downloadArtifact({
owner: context.repo.owner,
repo: context.repo.repo,
artifact_id: matchArtifact.id,
archive_format: 'zip',
let matchArtifacts = allArtifacts.data.artifacts.filter((artifact) => {
return artifact.name.startsWith("api-artifact-") || artifact.name == "api-artifact"
});
let fs = require('fs');
fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/api-artifact.zip`, Buffer.from(download.data));
- name: Extract artifact
run: unzip api-artifact.zip -d artifacts
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: Extract all artifacts
run: |
find . -mindepth 1 -maxdepth 1 -type f -name '*.zip' -exec unzip {} -d artifacts ';'
ls -la
- name: Load PR Number
id: load-pr-num
run: echo "pr-number=$(cat artifacts/pr_number)" >> "$GITHUB_OUTPUT"
Expand All @@ -56,7 +60,7 @@ jobs:
- name: Echo full diff
run: cat ./api-full.json.diff
- name: Upload full diff to Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: api-artifact
path: |
Expand All @@ -83,3 +87,11 @@ jobs:
pr_number: ${{ steps.load-pr-num.outputs.pr-number }}
comment_tag: show_diff
filePath: ./output.md
- name: Tell error to PR
uses: thollander/actions-comment-pull-request@v2
if: failure() && steps.load-pr-num.outputs.pr-number
with:
pr_number: ${{ steps.load-pr-num.outputs.pr-number }}
comment_tag: show_diff_error
message: |
api.json ๊ฐ„ ์ฐจ์ด์ ์„ ์ƒ์„ฑํ•˜๋Š” ๋„์ค‘ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค. ์ž์„ธํ•œ ๋‚ด์šฉ์€ [Workflow ๋กœ๊ทธ](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})๋ฅผ ํ™•์ธํ•ด ์ฃผ์„ธ์š”.
Loading

0 comments on commit cfa914e

Please sign in to comment.