Skip to content

Commit 1f23912

Browse files
committed
docs(en): merging all conflicts
2 parents 2a733b7 + f6d762c commit 1f23912

File tree

5 files changed

+40
-6
lines changed

5 files changed

+40
-6
lines changed

.github/workflows/analyze.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- main # change this if your default branch is named differently
88
workflow_dispatch:
99

10+
permissions: {}
11+
1012
jobs:
1113
event_type:
1214
runs-on: ubuntu-latest
@@ -37,7 +39,7 @@ jobs:
3739
- name: Restore cached node_modules
3840
uses: actions/cache@v4
3941
with:
40-
path: "**/node_modules"
42+
path: '**/node_modules'
4143
key: node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
4244

4345
- name: Install deps
@@ -69,8 +71,13 @@ jobs:
6971
name: bundle_analysis.json
7072

7173
- name: Download base branch bundle stats
74+
<<<<<<< HEAD
7275
uses: dawidd6/action-download-artifact@v3
7376
if: success()
77+
=======
78+
uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e
79+
if: success() && github.event.number
80+
>>>>>>> f6d762cbbf958ca45bb8d1d011b31e5289e43a3d
7481
with:
7582
workflow: analyze.yml
7683
branch: ${{ github.event.pull_request.base.ref || 'main' }}

.github/workflows/analyze_comment.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ name: Analyze Bundle (Comment)
22

33
on:
44
workflow_run:
5-
workflows: ["Analyze Bundle"]
5+
workflows: ['Analyze Bundle']
66
types:
77
- completed
88

9+
permissions: {}
10+
911
jobs:
1012
comment:
1113
runs-on: ubuntu-latest
@@ -25,17 +27,25 @@ jobs:
2527
echo "event-type=$event_type" >> $GITHUB_OUTPUT
2628
2729
- name: Download base branch bundle stats
30+
<<<<<<< HEAD
2831
if: github.event.workflow_run.conclusion == 'success' && steps.get-type.outputs.event-type == 'pull_request'
2932
uses: dawidd6/action-download-artifact@v3
33+
=======
34+
uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e
35+
>>>>>>> f6d762cbbf958ca45bb8d1d011b31e5289e43a3d
3036
with:
3137
workflow: analyze.yml
3238
run_id: ${{ github.event.workflow_run.id }}
3339
name: analysis_comment.txt
3440
path: analysis_comment.txt
3541

3642
- name: Download PR number
43+
<<<<<<< HEAD
3744
if: github.event.workflow_run.conclusion == 'success' && steps.get-type.outputs.event-type == 'pull_request'
3845
uses: dawidd6/action-download-artifact@v3
46+
=======
47+
uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e
48+
>>>>>>> f6d762cbbf958ca45bb8d1d011b31e5289e43a3d
3949
with:
4050
workflow: analyze.yml
4151
run_id: ${{ github.event.workflow_run.id }}
@@ -61,7 +71,7 @@ jobs:
6171
echo "pr-number=$pr_number" >> $GITHUB_OUTPUT
6272
6373
- name: Comment
64-
uses: marocchino/sticky-pull-request-comment@v2
74+
uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728
6575
with:
6676
header: next-bundle-analysis
6777
number: ${{ steps.get-comment-body.outputs.pr-number }}

.github/workflows/discord_notify.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
name: Discord Notify
22

33
on:
4-
pull_request_target:
4+
pull_request:
55
types: [opened, ready_for_review]
66

7+
permissions: {}
8+
79
jobs:
810
check_maintainer:
911
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
12+
permissions:
13+
# Used by check_maintainer
14+
contents: read
1015
with:
1116
actor: ${{ github.event.pull_request.user.login }}
1217
is_remote: true

.github/workflows/label_core_team_prs.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Label Core Team PRs
22

33
on:
4-
pull_request_target:
4+
pull_request:
5+
6+
permissions: {}
57

68
env:
79
TZ: /usr/share/zoneinfo/America/Los_Angeles
@@ -11,6 +13,9 @@ env:
1113
jobs:
1214
check_maintainer:
1315
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
16+
permissions:
17+
# Used by check_maintainer
18+
contents: read
1419
with:
1520
actor: ${{ github.event.pull_request.user.login }}
1621
is_remote: true
@@ -19,6 +24,11 @@ jobs:
1924
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
2025
runs-on: ubuntu-latest
2126
needs: check_maintainer
27+
permissions:
28+
# Used to add labels on issues
29+
issues: write
30+
# Used to add labels on PRs
31+
pull-requests: write
2232
steps:
2333
- name: Label PR as React Core Team
2434
uses: actions/github-script@v7

.github/workflows/site_lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
pull_request:
88
types: [opened, synchronize, reopened]
99

10+
permissions: {}
11+
1012
jobs:
1113
lint:
1214
runs-on: ubuntu-latest
@@ -25,7 +27,7 @@ jobs:
2527
- name: Restore cached node_modules
2628
uses: actions/cache@v4
2729
with:
28-
path: "**/node_modules"
30+
path: '**/node_modules'
2931
key: node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
3032

3133
- name: Install deps

0 commit comments

Comments
 (0)