Skip to content

Commit

Permalink
Merge branch 'master' of github.com:RT-Thread/rt-thread
Browse files Browse the repository at this point in the history
  • Loading branch information
1078249029 committed Jan 16, 2025
2 parents 992633f + d3841c3 commit 4af5702
Show file tree
Hide file tree
Showing 610 changed files with 47,058 additions and 6,850 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/action_tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ permissions:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Tools
if: github.repository_owner == 'RT-Thread'
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/action_utest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ permissions:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: ${{ matrix.legs.UTEST }}
if: github.repository_owner == 'RT-Thread'
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/labeler@v5
5 changes: 3 additions & 2 deletions .github/workflows/bsp_buildings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: ${{ matrix.legs.RTT_BSP }}
if: github.repository_owner == 'RT-Thread'
strategy:
Expand Down Expand Up @@ -101,6 +101,7 @@ jobs:
- "rm48x50"
- "ht32/ht32f52352"
- "ht32/ht32f12366"
- "ht32/ht32f53252"
- "w60x"
- "essemi/es32f0654"
- "essemi/es32f365x"
Expand Down Expand Up @@ -509,4 +510,4 @@ jobs:
run: |
curl -X POST -H "Authorization: token ${{ secrets.RTTHREAD_GITHUB_TOKEN }}" \
-d '{"body":"@${{ github.actor }}, Thank you for your contribution, but there was an error with the action. Could you please help check the BSP compilation issue? Thank you."}' \
"https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
"https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
2 changes: 1 addition & 1 deletion .github/workflows/compile_bsp_with_drivers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: BSP Compilation with More Drivers

steps:
Expand Down
41 changes: 38 additions & 3 deletions .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,63 @@ on:
- 'components/dfs/dfs_v2/include/**'
- 'components/dfs/dfs_v2/src/**'
- 'components/finsh/**'
- '.github/workflows/doxygen.yml'
# Runs at 16:00 UTC (BeiJing 00:00) on the 30st of every month
push:
branches: [master]
paths:
- 'documentation/doxygen/**'
- 'src/**'
- 'include/**'
- 'components/drivers/include/drivers/**'
- 'components/dfs/dfs_v2/include/**'
- 'components/dfs/dfs_v2/src/**'
- 'components/finsh/**'
- '.github/workflows/doxygen.yml'
schedule:
- cron: '0 16 30 * *'
workflow_dispatch:


permissions:
contents: read
pages: write
id-token: write

jobs:
build:
runs-on: ubuntu-22.04
name: doxygen_doc generate
if: github.repository_owner == 'RT-Thread'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@main
with:
submodules: 'recursive'
- name: Install Tools
shell: bash
run: |
sudo apt-get update
sudo apt-get -qq install doxygen graphviz
- name: generat doxygen html
- name: generate doxygen html
shell: bash
run: |
cd documentation/doxygen
doxygen Doxyfile
cat Doxyfile
- name: Upload static files as artifact
id: deployment
uses: actions/upload-pages-artifact@main # or specific "vX.X.X" version tag for this action
with:
path: documentation/doxygen/html/

deploy:
if: github.event_name == 'push'
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-22.04
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@main
2 changes: 1 addition & 1 deletion .github/workflows/format_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
scancode_job:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Scan code format and license
if: github.repository_owner == 'RT-Thread'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_bsp_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: ${{ github.event.inputs.bsp_options }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: ${{ github.event.inputs.bsp_options }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_trigger_scons_STM32_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: ${{ matrix.legs.RTT_BSP }}
if: github.repository_owner == 'RT-Thread'
strategy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: ${{ matrix.legs.RTT_BSP }}
if: github.repository_owner == 'RT-Thread'
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_trigger_scons_fail_bsp_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: ${{ matrix.legs.RTT_BSP }}
if: github.repository_owner == 'RT-Thread'
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_trigger_update_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: update and create pull request
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spell_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
spelling:
name: Check Spelling
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.repository_owner == 'RT-Thread'
steps:
- name: output ignore words info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_code_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:

jobs:
scancode_job:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Static code analysis
if: github.repository_owner == 'RT-Thread'
steps:
Expand Down
4 changes: 0 additions & 4 deletions bsp/apm32/libraries/Drivers/drv_sdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
#define SDIO_BUFF_SIZE 4096
#define SDIO_ALIGN_LEN 32

#ifndef SDIO_MAX_FREQ
#define SDIO_MAX_FREQ (1000000)
#endif

#ifndef SDIO_BASE_ADDRESS
#define SDIO_BASE_ADDRESS (0x40012800U)
#endif
Expand Down
4 changes: 0 additions & 4 deletions bsp/at32/libraries/rt_drivers/drv_sdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
#define SDIO_BUFF_SIZE 4096
#define SDIO_ALIGN_LEN 32

#ifndef SDIO_MAX_FREQ
#define SDIO_MAX_FREQ (1000000)
#endif

#ifndef SDIO_BASE_ADDRESS
#define SDIO_BASE_ADDRESS SDIO1_BASE
#endif
Expand Down
4 changes: 0 additions & 4 deletions bsp/bluetrum/libraries/hal_drivers/drv_sdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
#define SDIO_BUFF_SIZE 1024
#define SDIO_ALIGN_LEN 32

#ifndef SDIO_MAX_FREQ
#define SDIO_MAX_FREQ (1000000)
#endif

#ifndef SDIO_BASE_ADDRESS
#define SDIO_BASE_ADDRESS (0x40012800U)
#endif
Expand Down
Loading

0 comments on commit 4af5702

Please sign in to comment.