Skip to content

Commit 6f1342e

Browse files
authored
Merge branch 'RT-Thread:master' into test1
2 parents 07e67bc + fa6f86e commit 6f1342e

File tree

7 files changed

+78
-76
lines changed

7 files changed

+78
-76
lines changed

.github/workflows/bsp_buildings.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -293,15 +293,15 @@ jobs:
293293
name: 00_all_bsp_output_${{ github.sha }}
294294
path: output/
295295

296-
# Post CI status to PR comment
297-
post-ci-status:
298-
needs: build
299-
if: always() && github.event_name == 'pull_request' && github.repository_owner == 'RT-Thread'
300-
uses: ./.github/workflows/post_ci_status.yml
301-
with:
302-
workflow_name: "RT-Thread BSP Static Build Check"
303-
workflow_status: ${{ needs.build.result }}
304-
pr_number: ${{ github.event.pull_request.number }}
305-
permissions:
306-
pull-requests: write
307-
issues: write
296+
# # Post CI status to PR comment
297+
# post-ci-status:
298+
# needs: build
299+
# if: always() && github.event_name == 'pull_request' && github.repository_owner == 'RT-Thread'
300+
# uses: ./.github/workflows/post_ci_status.yml
301+
# with:
302+
# workflow_name: "RT-Thread BSP Static Build Check"
303+
# workflow_status: ${{ needs.build.result }}
304+
# pr_number: ${{ github.event.pull_request.number }}
305+
# permissions:
306+
# pull-requests: write
307+
# issues: write

.github/workflows/ci_results_comment.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010
name: CI Results Comment
1111

12-
on:
13-
workflow_run:
14-
workflows:
15-
- "RT-Thread BSP Static Build Check"
16-
- "Static code analysis"
17-
- "Check File Format and License"
18-
- "utest_auto_run"
19-
- "ToolsCI"
20-
- "pkgs_test"
21-
types:
22-
- completed
12+
# on:
13+
# workflow_run:
14+
# workflows:
15+
# - "RT-Thread BSP Static Build Check"
16+
# - "Static code analysis"
17+
# - "Check File Format and License"
18+
# - "utest_auto_run"
19+
# - "ToolsCI"
20+
# - "pkgs_test"
21+
# types:
22+
# - completed
2323

2424
permissions:
2525
pull-requests: write

.github/workflows/format_check.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
pip install click chardet PyYaml
3232
python tools/ci/file_check.py check 'https://github.com/RT-Thread/rt-thread' 'master'
3333
34-
# Post CI status to PR comment
35-
post-ci-status:
36-
needs: scancode_job
37-
if: always() && github.event_name == 'pull_request' && github.repository_owner == 'RT-Thread'
38-
uses: ./.github/workflows/post_ci_status.yml
39-
with:
40-
workflow_name: "Check File Format and License"
41-
workflow_status: ${{ needs.scancode_job.result }}
42-
pr_number: ${{ github.event.pull_request.number }}
43-
permissions:
44-
pull-requests: write
45-
issues: write
34+
# # Post CI status to PR comment
35+
# post-ci-status:
36+
# needs: scancode_job
37+
# if: always() && github.event_name == 'pull_request' && github.repository_owner == 'RT-Thread'
38+
# uses: ./.github/workflows/post_ci_status.yml
39+
# with:
40+
# workflow_name: "Check File Format and License"
41+
# workflow_status: ${{ needs.scancode_job.result }}
42+
# pr_number: ${{ github.event.pull_request.number }}
43+
# permissions:
44+
# pull-requests: write
45+
# issues: write

.github/workflows/post_ci_status.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99

1010
name: Post CI Status Comment
1111

12-
on:
13-
workflow_call:
14-
inputs:
15-
workflow_name:
16-
description: 'Name of the workflow'
17-
required: true
18-
type: string
19-
workflow_status:
20-
description: 'Status of the workflow (success/failure)'
21-
required: true
22-
type: string
23-
pr_number:
24-
description: 'Pull request number'
25-
required: true
26-
type: number
12+
# on:
13+
# workflow_call:
14+
# inputs:
15+
# workflow_name:
16+
# description: 'Name of the workflow'
17+
# required: true
18+
# type: string
19+
# workflow_status:
20+
# description: 'Status of the workflow (success/failure)'
21+
# required: true
22+
# type: string
23+
# pr_number:
24+
# description: 'Pull request number'
25+
# required: true
26+
# type: number
2727

2828
permissions:
2929
pull-requests: write
@@ -36,6 +36,8 @@ jobs:
3636
steps:
3737
- name: Post or update CI status comment
3838
uses: actions/github-script@v7
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3941
with:
4042
script: |
4143
const prNumber = ${{ inputs.pr_number }};

.github/workflows/static_code_analysis.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ jobs:
5656
cd ..
5757
python tools/ci/cpp_check.py check
5858
59-
# Post CI status to PR comment
60-
post-ci-status:
61-
needs: scancode_job
62-
if: always() && github.event_name == 'pull_request' && github.repository_owner == 'RT-Thread'
63-
uses: ./.github/workflows/post_ci_status.yml
64-
with:
65-
workflow_name: "Static code analysis"
66-
workflow_status: ${{ needs.scancode_job.result }}
67-
pr_number: ${{ github.event.pull_request.number }}
68-
permissions:
69-
pull-requests: write
70-
issues: write
59+
# # Post CI status to PR comment
60+
# post-ci-status:
61+
# needs: scancode_job
62+
# if: always() && github.event_name == 'pull_request' && github.repository_owner == 'RT-Thread'
63+
# uses: ./.github/workflows/post_ci_status.yml
64+
# with:
65+
# workflow_name: "Static code analysis"
66+
# workflow_status: ${{ needs.scancode_job.result }}
67+
# pr_number: ${{ github.event.pull_request.number }}
68+
# permissions:
69+
# pull-requests: write
70+
# issues: write

.github/workflows/utest_auto_run.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,15 @@ jobs:
305305
break
306306
fi
307307
done
308-
# Post CI status to PR comment
309-
post-ci-status:
310-
needs: test
311-
if: always() && github.event_name == 'pull_request' && github.repository_owner == 'RT-Thread'
312-
uses: ./.github/workflows/post_ci_status.yml
313-
with:
314-
workflow_name: "utest_auto_run"
315-
workflow_status: ${{ needs.test.result }}
316-
pr_number: ${{ github.event.pull_request.number }}
317-
permissions:
318-
pull-requests: write
319-
issues: write
308+
# # Post CI status to PR comment
309+
# post-ci-status:
310+
# needs: test
311+
# if: always() && github.event_name == 'pull_request' && github.repository_owner == 'RT-Thread'
312+
# uses: ./.github/workflows/post_ci_status.yml
313+
# with:
314+
# workflow_name: "utest_auto_run"
315+
# workflow_status: ${{ needs.test.result }}
316+
# pr_number: ${{ github.event.pull_request.number }}
317+
# permissions:
318+
# pull-requests: write
319+
# issues: write

libcpu/arm/cortex-m33/context_gcc.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
*/
1414

1515
/**
16-
* @addtogroup cortex-m4
16+
* @addtogroup cortex-m33
1717
*/
1818
/*@{*/
1919

2020
#include <rtconfig.h>
2121

22-
.cpu cortex-m4
22+
.cpu cortex-m33
2323
.syntax unified
2424
.thumb
2525
.text

0 commit comments

Comments
 (0)