diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-05-12 08:01:31 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-05-12 08:01:31 +0900 |
| commit | bb3c85d3a19bda46119f0ef5d4c8ccf257859eac (patch) | |
| tree | 56ae70301ef3179669dbc0a26c023c16a07681ca | |
| parent | Update basic.cy.js (diff) | |
| parent | ci: fix missing branch (diff) | |
| download | misskey-bb3c85d3a19bda46119f0ef5d4c8ccf257859eac.tar.gz misskey-bb3c85d3a19bda46119f0ef5d4c8ccf257859eac.tar.bz2 misskey-bb3c85d3a19bda46119f0ef5d4c8ccf257859eac.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
| -rw-r--r-- | .github/workflows/storybook.yml | 18 | ||||
| -rw-r--r-- | packages/frontend/.storybook/changes.ts | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkUserSetupDialog.Privacy.vue | 4 |
3 files changed, 20 insertions, 4 deletions
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml index 05efbb12e6..b04f4260c3 100644 --- a/.github/workflows/storybook.yml +++ b/.github/workflows/storybook.yml @@ -57,7 +57,11 @@ jobs: if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then echo "skip=true" >> $GITHUB_OUTPUT fi - pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static $(echo "$CHROMATIC_PARAMETER") + if pnpm --filter frontend chromatic -d storybook-static $(echo "$CHROMATIC_PARAMETER"); then + echo "success=true" >> $GITHUB_OUTPUT + else + echo "success=false" >> $GITHUB_OUTPUT + fi env: CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} - name: Publish to Chromatic @@ -75,6 +79,18 @@ jobs: pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static $(echo "$CHROMATIC_PARAMETER") env: CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} + - name: Notify that Chromatic detects changes + uses: actions/github-script@v6.4.0 + if: github.event_name != 'pull_request_target' && steps.chromatic_push.outputs.success == 'false' + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + github.rest.repos.createCommitComment({ + owner: context.repo.owner, + repo: context.repo.repo, + commit_sha: context.sha, + body: 'Chromatic detects changes. Please [review the changes on Chromatic](https://www.chromatic.com/builds?appId=6428f7d7b962f0b79f97d6e4).' + }) - name: Notify that Chromatic will skip testing uses: actions/github-script@v6.4.0 if: github.event_name == 'pull_request_target' && steps.chromatic_pull_request.outputs.skip == 'true' diff --git a/packages/frontend/.storybook/changes.ts b/packages/frontend/.storybook/changes.ts index 755bec6869..fc0f0c286b 100644 --- a/packages/frontend/.storybook/changes.ts +++ b/packages/frontend/.storybook/changes.ts @@ -45,7 +45,7 @@ fs.readFile( micromatch(Array.from(modules), [ '../../assets/**', '../../fluent-emojis/**', - '../../locales/**', + '../../locales/ja-JP.yml', '../../misskey-assets/**', 'assets/**', 'public/**', diff --git a/packages/frontend/src/components/MkUserSetupDialog.Privacy.vue b/packages/frontend/src/components/MkUserSetupDialog.Privacy.vue index 4ed5c3ab00..5fc6fd4d2f 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.Privacy.vue +++ b/packages/frontend/src/components/MkUserSetupDialog.Privacy.vue @@ -37,8 +37,8 @@ let hideOnlineStatus = ref(false); let noCrawle = ref(false); let preventAiLearning = ref(true); -watch(isLocked, () => { - os.apiWithDialog('i/update', { +watch([isLocked, hideOnlineStatus, noCrawle, preventAiLearning], () => { + os.api('i/update', { isLocked: !!isLocked.value, hideOnlineStatus: !!hideOnlineStatus.value, noCrawle: !!noCrawle.value, |