Skip to content

Commit ec6fe35

Browse files
Rbb666Rbb666
committed
add ci build.
1 parent e0bc4d3 commit ec6fe35

File tree

70 files changed

+1128
-1138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1128
-1138
lines changed

‎.github/workflows/action.yml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
name: PSOC-Edge-Edgi-Talk
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
# events but only for the master branch
5+
on:
6+
# Runs at 16:00 UTC (BeiJing 00:00) on the 1st of every month
7+
schedule:
8+
- cron: '0 16 1 * *'
9+
push:
10+
branches:
11+
- main
12+
paths-ignore:
13+
- docs/**
14+
- '**/README.md'
15+
# - '**/README_ZH.md'
16+
pull_request:
17+
branches:
18+
- main
19+
paths-ignore:
20+
- docs/**
21+
- '**/README.md'
22+
# - '**/README_ZH.md'
23+
24+
env:
25+
RTT_TOOL_CHAIN: "sourcery-arm"
26+
27+
jobs:
28+
check:
29+
runs-on: ubuntu-latest
30+
name: check-yaml-format
31+
if: github.repository_owner == 'RT-Thread-Studio'
32+
steps:
33+
- uses: actions/checkout@v2
34+
- name: Set up Python
35+
uses: actions/setup-python@master
36+
with:
37+
python-version: 3.8
38+
39+
- name: Check yaml
40+
if: ${{ success() }}
41+
shell: bash
42+
run: |
43+
pip install rt-thread-studio
44+
python -c "from rt_thread_studio import bsp_checker;bsp_path = '.';checker = bsp_checker.BspChecker(bsp_path);checker.check();"
45+
46+
compile:
47+
needs: [check]
48+
runs-on: ubuntu-latest
49+
name: ${{ matrix.legs.RTT_BSP }}
50+
strategy:
51+
fail-fast: false
52+
matrix:
53+
legs:
54+
- {RTT_BSP: "Edgi-Talk_ADC/Edgi_Talk_M33_ADC"}
55+
- {RTT_BSP: "Edgi-Talk_AHT20/Edgi_Talk_M33_AHT20"}
56+
- {RTT_BSP: "Edgi-Talk_Audio/Edgi_Talk_M33_Audio"}
57+
- {RTT_BSP: "Edgi-Talk_Blink_Led/Edgi_Talk_M33_Blink_LED"}
58+
- {RTT_BSP: "Edgi-Talk_Blink_Led/Edgi_Talk_M55_Blink_LED"}
59+
- {RTT_BSP: "Edgi-Talk_CoreMark/Edgi_Talk_M55_CoreMark"}
60+
- {RTT_BSP: "Edgi-Talk_emUSB-device_CDC_Echo/Edgi_Talk_M33_emUSB-device_CDC_Echo"}
61+
- {RTT_BSP: "Edgi-Talk_HyperRam/Edgi_Talk_M33_HyperRam"}
62+
# - {RTT_BSP: "Edgi-Talk_HyperRam/Edgi_Talk_M33_S_HyperRam"}
63+
- {RTT_BSP: "Edgi-Talk_Key_Irq/Edgi_Talk_M33_Key_Irq"}
64+
- {RTT_BSP: "Edgi-Talk_LSM6DS3/Edgi_Talk_M33_LSM6DS3"}
65+
- {RTT_BSP: "Edgi-Talk_LVGL/Edgi_Talk_M55_LVGL"}
66+
# - {RTT_BSP: "Edgi-Talk_M33_S_Template/Edgi_Talk_M33_S_Template"}
67+
- {RTT_BSP: "Edgi-Talk_M33_Template/Edgi_Talk_M33_Template"}
68+
- {RTT_BSP: "Edgi-Talk_MIPI_LCD/Edgi_Talk_M55_MIPI_LCD"}
69+
- {RTT_BSP: "Edgi-Talk_RTC/Edgi_Talk_M33_RTC"}
70+
- {RTT_BSP: "Edgi-Talk_SDCARD/Edgi_Talk_M33_SDCARD"}
71+
- {RTT_BSP: "Edgi-Talk_WavPlayer/Edgi_Talk_M33_WavPlayer"}
72+
- {RTT_BSP: "Edgi-Talk_WIFI/Edgi_Talk_M55_WIFI"}
73+
- {RTT_BSP: "Edgi-Talk_XiaoZhi/Edgi_Talk_M55_XiaoZhi"}
74+
steps:
75+
- uses: actions/checkout@v2
76+
- name: Set up Python
77+
uses: actions/setup-python@master
78+
with:
79+
python-version: 3.8
80+
81+
- name: Install Arm ToolChains
82+
if: ${{ success() }}
83+
shell: bash
84+
run: |
85+
wget -c https://github.com/RT-Thread/toolchains-ci/releases/download/v1.10/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz
86+
sudo tar -xf arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz -C /opt
87+
/opt/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi/bin/arm-none-eabi-gcc --version
88+
echo "RTT_EXEC_PATH=/opt/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi/bin" >> $GITHUB_ENV
89+
90+
- name: Install Tools
91+
if: ${{ success() }}
92+
shell: bash
93+
run: |
94+
sudo apt-get update
95+
sudo apt-get -qq install gcc-multilib libsdl2-dev scons
96+
echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV
97+
echo "RTT_CC=gcc" >> $GITHUB_ENV
98+
99+
- name: Compile ${{ matrix.legs.RTT_BSP }}
100+
if: ${{ success() }}
101+
shell: bash
102+
env:
103+
RTT_BSP: ${{ matrix.legs.RTT_BSP }}
104+
run: |
105+
cd projects
106+
scons -C $RTT_BSP

‎libraries/HAL_Drivers/SConscript‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ if GetDepend(['BSP_USING_TIM']):
6969
path = [cwd]
7070
path += [cwd + '/config']
7171

72-
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
72+
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, LOCAL_CPPPATH = path)
7373

7474
Return('group')
75+

‎libraries/components/mtb-device-support-pse8xxgp/pdl/SConscript‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@ src = Split('''
2121
drivers/source/cy_scb_common.c
2222
''')
2323

24-
path = [cwd + '/drivers/include',
25-
cwd + '/drivers/third_party/ethernet/include']
24+
# Add toolchain-specific assembly files
25+
if rtconfig.PLATFORM in ['gcc']:
26+
src += ['drivers/source/TOOLCHAIN_GCC_ARM/cy_syslib_ext.S']
27+
elif rtconfig.PLATFORM in ['armclang']:
28+
src += ['drivers/source/TOOLCHAIN_ARM/cy_syslib_ext.S']
29+
30+
path = [cwd + '/drivers/include', cwd + 'drivers/third_party/ethernet/include']
2631

2732
if GetDepend(['SOC_SERIES_IFX_PSOCE84']):
2833
src += ['drivers/source/cy_syspm_ppu.c']
@@ -138,3 +143,4 @@ if GetDepend(['SOC_SERIES_IFX_PSOCE84']):
138143

139144
group = DefineGroup('Libraries', src, depend=[''], CPPPATH=path, CPPDEFINES = CPPDEFINES)
140145
Return('group')
146+

‎projects/Edgi-Talk_ADC/Edgi_Talk_M33_ADC/.cproject‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎projects/Edgi-Talk_ADC/Edgi_Talk_M33_ADC/SConstruct‎

Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,19 @@ import platform
55
import subprocess
66
import uuid
77

8-
if os.getenv('RTT_ROOT'):
9-
RTT_ROOT = os.getenv('RTT_ROOT')
8+
if os.path.exists('rt-thread'):
9+
RTT_ROOT = os.path.normpath(os.getcwd() + '/rt-thread')
1010
else:
11-
RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')
12-
13-
# set RTT_ROOT
14-
if not os.getenv("RTT_ROOT"):
15-
RTT_ROOT="rt-thread"
11+
RTT_ROOT = os.path.normpath(os.getcwd() + '../../../../rt-thread')
1612

1713
sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
1814
try:
1915
from building import *
20-
except:
16+
except Exception as e:
17+
print("Error message:", e)
2118
print('Cannot found RT-Thread root directory, please check RTT_ROOT')
2219
print(RTT_ROOT)
23-
exit(-1)
20+
sys.exit(-1)
2421

2522
TARGET = 'rt-thread.' + rtconfig.TARGET_EXT
2623

@@ -45,7 +42,7 @@ SDK_ROOT = os.path.abspath('./')
4542
if os.path.exists(SDK_ROOT + '/libraries/components'):
4643
libraries_path_prefix = SDK_ROOT + '/libraries/components'
4744
else:
48-
libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/../libraries/components'
45+
libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/../../libraries/components'
4946

5047
SDK_LIB = libraries_path_prefix
5148
Export('SDK_LIB')
@@ -85,28 +82,48 @@ def ourspawn(sh, escape, cmd, args, e):
8582
os.remove(filename)
8683
return rv
8784

88-
# 解决env-scons不能链接长路径问题
8985
if platform.system() == 'Windows':
9086
env['SPAWN'] = ourspawn
9187

88+
# Add project libs with VariantDir
89+
if os.path.exists(os.path.join(os.getcwd(), "libs")):
90+
env.VariantDir('build/libs', 'libs', duplicate=0)
91+
else:
92+
env.VariantDir('build/libs', '../libs', duplicate=0)
93+
objs.extend(SConscript('../libs/SConscript', variant_dir='build/libs', duplicate=0))
94+
9295
if os.path.exists(os.path.join(os.getcwd(), "libraries")):
93-
objs.extend(SConscript(os.path.join('libraries', 'HAL_Drivers', 'SConscript')))
94-
objs.extend(SConscript(os.path.join('libraries/components/Infineon_cmsis-latest', '', 'SConscript')))
95-
objs.extend(SConscript(os.path.join('libraries/components/Infineon_core-lib-latest', '', 'SConscript')))
96-
objs.extend(SConscript(os.path.join('libraries/components/mtb-device-support-pse8xxgp/hal', '', 'SConscript')))
97-
objs.extend(SConscript(os.path.join('libraries/components/mtb-device-support-pse8xxgp/pdl', '', 'SConscript')))
98-
objs.extend(SConscript(os.path.join('libraries/components/async-transfer', '', 'SConscript')))
99-
objs.extend(SConscript(os.path.join('libraries/components/mtb-device-support-pse8xxgp/device-utils/syspm', '', 'SConscript')))
100-
objs.extend(SConscript(os.path.join('libraries/components/Infineon_retarget-io-latest', '', 'SConscript')))
96+
# Set VariantDir for libraries
97+
env.VariantDir('build/libraries/HAL_Drivers', 'libraries/HAL_Drivers', duplicate=0)
98+
env.VariantDir('build/libraries/components', 'libraries/components', duplicate=0)
99+
100+
objs.extend(SConscript('libraries/HAL_Drivers/SConscript', variant_dir='build/libraries/HAL_Drivers', duplicate=0))
101+
objs.extend(SConscript('libraries/components/Infineon_cmsis-latest/SConscript', variant_dir='build/libraries/components/Infineon_cmsis-latest', duplicate=0))
102+
objs.extend(SConscript('libraries/components/Infineon_core-lib-latest/SConscript', variant_dir='build/libraries/components/Infineon_core-lib-latest', duplicate=0))
103+
objs.extend(SConscript('libraries/components/mtb-device-support-pse8xxgp/hal/SConscript', variant_dir='build/libraries/components/mtb-device-support-pse8xxgp/hal', duplicate=0))
104+
objs.extend(SConscript('libraries/components/mtb-device-support-pse8xxgp/pdl/SConscript', variant_dir='build/libraries/components/mtb-device-support-pse8xxgp/pdl', duplicate=0))
105+
objs.extend(SConscript('libraries/components/async-transfer/SConscript', variant_dir='build/libraries/components/async-transfer', duplicate=0))
106+
objs.extend(SConscript('libraries/components/mtb-device-support-pse8xxgp/device-utils/syspm/SConscript', variant_dir='build/libraries/components/mtb-device-support-pse8xxgp/device-utils/syspm', duplicate=0))
107+
objs.extend(SConscript('libraries/components/serial-memory/SConscript', variant_dir='build/libraries/components/serial-memory', duplicate=0))
108+
objs.extend(SConscript('libraries/components/Infineon_retarget-io-latest/SConscript', variant_dir='build/libraries/components/Infineon_retarget-io-latest', duplicate=0))
109+
objs.extend(SConscript('libraries/components/ASRC/SConscript', variant_dir='build/libraries/components/ASRC', duplicate=0))
110+
objs.extend(SConscript('libraries/components/SConscript', variant_dir='build/libraries/components', duplicate=0))
101111
else:
102-
objs.extend(SConscript(os.path.join('../libraries', 'HAL_Drivers', 'SConscript')))
103-
objs.extend(SConscript(os.path.join('../libraries/components/Infineon_cmsis-latest', '', 'SConscript')))
104-
objs.extend(SConscript(os.path.join('../libraries/components/Infineon_core-lib-latest', '', 'SConscript')))
105-
objs.extend(SConscript(os.path.join('../libraries/components/mtb-device-support-pse8xxgp/hal', '', 'SConscript')))
106-
objs.extend(SConscript(os.path.join('../libraries/components/mtb-device-support-pse8xxgp/pdl', '', 'SConscript')))
107-
objs.extend(SConscript(os.path.join('../libraries/components/async-transfer', '', 'SConscript')))
108-
objs.extend(SConscript(os.path.join('../libraries/components/mtb-device-support-pse8xxgp/device-utils/syspm', '', 'SConscript')))
109-
objs.extend(SConscript(os.path.join('../libraries/components/Infineon_retarget-io-latest', '', 'SConscript')))
112+
# Set VariantDir for external libraries
113+
env.VariantDir('build/libraries/HAL_Drivers', '../../../libraries/HAL_Drivers', duplicate=0)
114+
env.VariantDir('build/libraries/components', '../../../libraries/components', duplicate=0)
115+
116+
objs.extend(SConscript('../../../libraries/HAL_Drivers/SConscript', variant_dir='build/libraries/HAL_Drivers', duplicate=0))
117+
objs.extend(SConscript('../../../libraries/components/Infineon_cmsis-latest/SConscript', variant_dir='build/libraries/components/Infineon_cmsis-latest', duplicate=0))
118+
objs.extend(SConscript('../../../libraries/components/Infineon_core-lib-latest/SConscript', variant_dir='build/libraries/components/Infineon_core-lib-latest', duplicate=0))
119+
objs.extend(SConscript('../../../libraries/components/mtb-device-support-pse8xxgp/hal/SConscript', variant_dir='build/libraries/components/mtb-device-support-pse8xxgp/hal', duplicate=0))
120+
objs.extend(SConscript('../../../libraries/components/mtb-device-support-pse8xxgp/pdl/SConscript', variant_dir='build/libraries/components/mtb-device-support-pse8xxgp/pdl', duplicate=0))
121+
objs.extend(SConscript('../../../libraries/components/async-transfer/SConscript', variant_dir='build/libraries/components/async-transfer', duplicate=0))
122+
objs.extend(SConscript('../../../libraries/components/mtb-device-support-pse8xxgp/device-utils/syspm/SConscript', variant_dir='build/libraries/components/mtb-device-support-pse8xxgp/device-utils/syspm', duplicate=0))
123+
objs.extend(SConscript('../../../libraries/components/serial-memory/SConscript', variant_dir='build/libraries/components/serial-memory', duplicate=0))
124+
objs.extend(SConscript('../../../libraries/components/Infineon_retarget-io-latest/SConscript', variant_dir='build/libraries/components/Infineon_retarget-io-latest', duplicate=0))
125+
objs.extend(SConscript('../../../libraries/components/ASRC/SConscript', variant_dir='build/libraries/components/ASRC', duplicate=0))
126+
objs.extend(SConscript('../../../libraries/components/SConscript', variant_dir='build/libraries/components', duplicate=0))
110127

111128
# make a building
112129
DoBuilding(TARGET, objs)

‎projects/Edgi-Talk_ADC/Edgi_Talk_M33_ADC/board/SConscript‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ for filename in os.listdir(startup_path_prefix):
2121
if index in filename:
2222
Tool_path = os.path.join(startup_path_prefix, filename)
2323

24-
if rtconfig.PLATFORM in ["gcc"]:
25-
src += [Tool_path + "/pdl/drivers/source/TOOLCHAIN_GCC_ARM/cy_syslib_ext.S"]
26-
elif rtconfig.PLATFORM in ["armclang"]:
27-
src += [Tool_path + "/pdl/drivers/source/TOOLCHAIN_ARM/cy_syslib_ext.S"]
2824

2925
CPPDEFINES = [
3026
"COMPONENT_CAT1",

‎projects/Edgi-Talk_ADC/libs/SConscript‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ if rtconfig.PLATFORM in ['iccarm']:
1313
Return('group')
1414
elif rtconfig.PLATFORM in ['gcc', 'armclang']:
1515

16-
src += [cwd + DIR + 'cybsp.c']
17-
src += [cwd + DIR + 'system_cat1d.c']
18-
src += Glob(cwd + DIR + 'config/GeneratedSource/*.c')
16+
src += ['TARGET_APP_KIT_PSE84_EVAL_EPC2/cybsp.c']
17+
src += ['TARGET_APP_KIT_PSE84_EVAL_EPC2/system_cat1d.c']
18+
src += Glob('TARGET_APP_KIT_PSE84_EVAL_EPC2/config/GeneratedSource/*.c')
1919

2020
if GetDepend(['KIT_PROCE84_EVK_M55']):
21-
src += [cwd + DIR + 'COMPONENT_CM55/COMPONENT_NON_SECURE_DEVICE/ns_system_pse84.c']
22-
src += [cwd + DIR + 'COMPONENT_CM55/COMPONENT_NON_SECURE_DEVICE/ns_start_pse84.c']
21+
src += ['TARGET_APP_KIT_PSE84_EVAL_EPC2/COMPONENT_CM55/COMPONENT_NON_SECURE_DEVICE/ns_system_pse84.c']
22+
src += ['TARGET_APP_KIT_PSE84_EVAL_EPC2/COMPONENT_CM55/COMPONENT_NON_SECURE_DEVICE/ns_start_pse84.c']
2323
if GetDepend(['KIT_PROCE84_EVK_M33']):
24-
src += [cwd + DIR + 'COMPONENT_CM33/COMPONENT_NON_SECURE_DEVICE/ns_system_pse84.c']
25-
src += [cwd + DIR + 'COMPONENT_CM33/COMPONENT_NON_SECURE_DEVICE/ns_start_pse84.c']
24+
src += ['TARGET_APP_KIT_PSE84_EVAL_EPC2/COMPONENT_CM33/COMPONENT_NON_SECURE_DEVICE/ns_system_pse84.c']
25+
src += ['TARGET_APP_KIT_PSE84_EVAL_EPC2/COMPONENT_CM33/COMPONENT_NON_SECURE_DEVICE/ns_start_pse84.c']
2626

2727
CPPPATH = [ cwd + DIR,
2828
cwd + DIR + 'config/GeneratedSource',
2929
cwd + DIR + 'config',
3030
cwd + DIR + 'bluetooth'
3131
]
3232

33-
group = DefineGroup('libs', src, depend = [''], CPPPATH = CPPPATH)
33+
group = DefineGroup('libs', src, depend = [''], CPPPATH = CPPPATH, LOCAL_CPPPATH = CPPPATH)
3434
Return('group')

0 commit comments

Comments
 (0)