graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 03:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
syuilo 2023-05-12 08:01:31 +09:00
commit bb3c85d3a1
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.github/workflows/storybook.yml vendored
View file

@ -57,7 +57,11 @@ jobs:
if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then
echo "skip=true" >> $GITHUB_OUTPUT echo "skip=true" >> $GITHUB_OUTPUT
fi 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: env:
CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
- name: Publish to Chromatic - name: Publish to Chromatic
@ -75,6 +79,18 @@ jobs:
pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static $(echo "$CHROMATIC_PARAMETER") pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static $(echo "$CHROMATIC_PARAMETER")
env: env:
CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} 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 - name: Notify that Chromatic will skip testing
uses: actions/github-script@v6.4.0 uses: actions/github-script@v6.4.0
if: github.event_name == 'pull_request_target' && steps.chromatic_pull_request.outputs.skip == 'true' if: github.event_name == 'pull_request_target' && steps.chromatic_pull_request.outputs.skip == 'true'

2
packages/frontend/.storybook/changes.ts
View file

@ -45,7 +45,7 @@ fs.readFile(
micromatch(Array.from(modules), [ micromatch(Array.from(modules), [
'../../assets/**', '../../assets/**',
'../../fluent-emojis/**', '../../fluent-emojis/**',
'../../locales/**', '../../locales/ja-JP.yml',
'../../misskey-assets/**', '../../misskey-assets/**',
'assets/**', 'assets/**',
'public/**', 'public/**',

4
packages/frontend/src/components/MkUserSetupDialog.Privacy.vue
View file

@ -37,8 +37,8 @@ let hideOnlineStatus = ref(false);
let noCrawle = ref(false); let noCrawle = ref(false);
let preventAiLearning = ref(true); let preventAiLearning = ref(true);
watch(isLocked, () => { watch([isLocked, hideOnlineStatus, noCrawle, preventAiLearning], () => {
os.apiWithDialog('i/update', { os.api('i/update', {
isLocked: !!isLocked.value, isLocked: !!isLocked.value,
hideOnlineStatus: !!hideOnlineStatus.value, hideOnlineStatus: !!hideOnlineStatus.value,
noCrawle: !!noCrawle.value, noCrawle: !!noCrawle.value,