Просмотр исходного кода

Split CI/CD into families.

Update CMSIS fetch version.
Konstantin Oblaukhov 5 лет назад
Родитель
Сommit
90b2866aa6

+ 6 - 3
.github/workflows/cmake.yml

@@ -9,6 +9,9 @@ env:
 jobs:
   test-ubuntu:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        family: [F0, F1, F2, F3, F4, F7, G0, G4, H7, L0, L1, L4, L5]
 
     steps:
     - uses: actions/checkout@v2
@@ -22,7 +25,7 @@ jobs:
     - name: Configure tests/fetch
       shell: bash
       working-directory: ${{runner.workspace}}/tests/fetch/build
-      run: cmake $GITHUB_WORKSPACE/tests/fetch/
+      run: cmake -DTEST_FAMILIES=${{ matrix.family }} $GITHUB_WORKSPACE/tests/fetch/
 
     - name: Build tests/fetch
       working-directory: ${{runner.workspace}}/tests/fetch/build
@@ -35,7 +38,7 @@ jobs:
     - name: Configure tests/cmsis
       shell: bash
       working-directory: ${{runner.workspace}}/tests/cmsis/build
-      run: cmake -DFETCH_ST_SOURCES=TRUE $GITHUB_WORKSPACE/tests/cmsis/
+      run: cmake -DTEST_FAMILIES=${{ matrix.family }} -DFETCH_ST_SOURCES=TRUE $GITHUB_WORKSPACE/tests/cmsis/
 
     - name: Build tests/cmsis
       working-directory: ${{runner.workspace}}/tests/cmsis/build
@@ -48,7 +51,7 @@ jobs:
     - name: Configure tests/hal
       shell: bash
       working-directory: ${{runner.workspace}}/tests/hal/build
-      run: cmake -DFETCH_ST_SOURCES=TRUE $GITHUB_WORKSPACE/tests/hal/
+      run: cmake -DTEST_FAMILIES=${{ matrix.family }} -DFETCH_ST_SOURCES=TRUE $GITHUB_WORKSPACE/tests/hal/
 
     - name: Build tests/hal
       working-directory: ${{runner.workspace}}/tests/hal/build

+ 3 - 3
cmake/stm32/utilities.cmake

@@ -43,9 +43,9 @@ endfunction()
 include(FetchContent)
 
 set(STM32_FETCH_FAMILIES       F0      F1      F2      F3      F4      F7      G0      G4      H7      L0      L1      L4      L5)
-set(STM32_FETCH_CUBE_VERSIONS  v1.11.1 v1.8.1  v1.9.0  v1.11.1 v1.25.1 v1.16.0 v1.3.0  v1.3.0  v1.8.0  v1.11.3 v1.10.0 v1.16.0 v1.3.1)
-set(STM32_FETCH_CMSIS_VERSIONS v2.3.4  v4.3.1  v2.2.4  v2.3.4  v2.6.4  v1.2.5  v1.3.0  v1.2.0  v1.9.0  v1.9.0  v2.3.1  v1.7.0  v1.0.3)
-set(STM32_FETCH_HAL_VERSIONS   v1.7.4  v1.1.6  v1.2.5  v1.5.4  v1.7.9  v1.2.8  v1.3.0  v1.2.0  v1.9.0  v1.10.3 v1.4.2  v1.12.0 v1.0.3)
+set(STM32_FETCH_CUBE_VERSIONS  v1.11.1 v1.8.1  v1.9.0  v1.11.1 v1.25.1 v1.16.0 v1.4.0  v1.3.0  v1.8.0  v1.11.3 v1.10.0 v1.16.0 v1.3.1)
+set(STM32_FETCH_CMSIS_VERSIONS v2.3.4  v4.3.1  v2.2.4  v2.3.4  v2.6.4  v1.2.5  v1.4.0  v1.2.0  v1.9.0  v1.9.0  v2.3.1  v1.7.0  v1.0.3)
+set(STM32_FETCH_HAL_VERSIONS   v1.7.4  v1.1.6  v1.2.5  v1.5.4  v1.7.9  v1.2.8  v1.4.0  v1.2.0  v1.9.0  v1.10.3 v1.4.2  v1.12.0 v1.0.3)
 
 FetchContent_Declare(
     STM32-CMSIS

+ 1 - 1
tests/cmsis/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/stm32_gcc.cmake)
 
 if(NOT TEST_FAMILIES)
-    set(TEST_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4)
+    set(TEST_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4 L5)
 endif()
 
 project(cmsis-test C ASM)

+ 1 - 1
tests/fetch/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/stm32_gcc.cmake)
 
 if(NOT TEST_FAMILIES)
-    set(TEST_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4)
+    set(TEST_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4 L5)
 endif()
 
 project(fetch-test C ASM)

+ 1 - 1
tests/hal/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/stm32_gcc.cmake)
 
 if(NOT TEST_FAMILIES)
-    set(TEST_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4)
+    set(TEST_FAMILIES F0 F1 F2 F3 F4 F7 G0 G4 H7 L0 L1 L4 L5)
 endif()
 
 project(hal-test C ASM)