fix cmp

mykrupp · Oct 1, 2024 · 1861b92 · 1861b92
1 parent 4b14fec
commit 1861b92
Show file tree

Hide file tree

Showing 4 changed files with 123 additions and 30 deletions.
diff --git a/.github/actions/install-tools/action.yaml b/.github/actions/install-tools/action.yaml
@@ -0,0 +1,28 @@
+name: Checkout submodules
+description: Checkout submodules
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Simplicity Commander
+      run: |
+        wget https://www.silabs.com/documents/public/software/SimplicityCommander-Linux.zip
+        unzip SimplicityCommander-Linux.zip -d /opt/silabs/simplicity-commander
+        rm SimplicityCommander-Linux.zip
+        FILE=$(find /opt/silabs/simplicity-commander/ -name "*Commander_linux_x86_64*")
+        if [ -n "$FILE" ]; then
+          echo "$FILE"
+          tar -xjvf "$FILE" -C /opt/silabs/simplicity-commander
+        else
+          echo "File not found"
+        fi
+    - name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
+      uses: carlosperate/arm-none-eabi-gcc-action@v1
+      id: arm-none-eabi-gcc-action
+      with:
+        release: '12.2.Rel1'
+    - name: Install ZAP
+      run: |
+        wget https://github.com/project-chip/zap/releases/download/v2024.08.27/zap-linux-x64.zip
+        unzip zap-linux-x64.zip -d /opt/silabs/zap-linux-x64
+        rm zap-linux-x64.zip
diff --git a/.github/workflows/full-build.yaml b/.github/workflows/full-build.yaml
@@ -0,0 +1,88 @@
+name: PR Build
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  efr32:
+    strategy:
+      matrix:
+        # Every app builds for every board and suffix
+        app: [dishwasher-app, light-switch-app, lighting-app, lock-app, onoff-plug-app, sensor-app, window-app]
+        board: [brd4116a, brd4117a, brd4118a, brd4121a, brd4186c, brd4187c, brd2703a, brd2704a, brd2601b, brd2608b, brd4316a, brd4317a, brd4319a, brd4337a]
+        suffix: [thread]
+        # Build only specific combinations of app, board and suffix
+        include:
+          # Thread boards that have thermostats
+          - board: brd4187c
+            app: thermostat
+            suffix: thread
+          - board: brd4316a
+            app: thermostat
+            suffix: thread
+          # Wi-Fi NCP combos
+          - board: brd4187c
+            app: thermostat
+            suffix: 917-ncp
+          - board: brd4187c
+            app: thermostat
+            suffix: rs911x
+          - board: brd4187c
+            app: thermostat
+            suffix: wf200
+          - board: brd4187c
+            app: lock-app
+            suffix: 917-ncp
+          - board: brd4187c
+            app: lock-app
+            suffix: rs911x
+          - board: brd4187c
+            app: lock-app
+            suffix: wf200  
+          - board: brd4187c
+            app: window-app
+            suffix: 917-ncp          
+
+    name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.board }} 
+
+    uses: ./.github/workflows/generate-and-build.yaml
+    with:
+      app: ${{ matrix.app }}
+      board: ${{ matrix.board }}
+      suffix: ${{ matrix.suffix }}
+
+  siwx917:
+    strategy:
+      matrix:
+        # Every app builds for every board and suffix
+        app: [dishwasher-app, light-switch-app, lighting-app, lock-app, onoff-plug-app, sensor-app, window-app]
+        board: [brd4338a]
+        suffix: [917-soc]
+
+    name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.board }} 
+
+    uses: ./.github/workflows/generate-and-build.yaml
+    with:
+      app: ${{ matrix.app }}
+      board: ${{ matrix.board }}
+      suffix: ${{ matrix.suffix }}
+      family: siwx917
+      extension: \;wiseconnect3_sdk
+
+  cmp:
+    strategy:
+      matrix:
+        # Every app builds for every board and suffix
+        app: [zigbee-matter-light]
+        board: [brd4187c, brd4116a, brd4117a, brd4118a]
+
+    name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.board }} 
+
+    uses: ./.github/workflows/generate-and-build.yaml
+    with:
+      app: ${{ matrix.app }}
+      board: ${{ matrix.board }}
+      suffix: ${{ matrix.suffix }}
+      family: efr32
+
diff --git a/.github/workflows/generate-and-build.yaml b/.github/workflows/generate-and-build.yaml
@@ -4,16 +4,16 @@ on:
   workflow_call:
     inputs:
       app:
-        required: true
+        required: false
         type: string
       board:
-        required: true
+        required: false
         type: string
       suffix:
-        required: true
+        required: false
         type: string
       family:
-        required: true
+        required: false
         type: string
       extension:
         required: false
@@ -33,30 +33,8 @@ jobs:
           submodules: 'true'
 # TODO don't need to check out all submodules
 
-      - name: Install Simplicity Commander
-        run: |
-          wget https://www.silabs.com/documents/public/software/SimplicityCommander-Linux.zip
-          unzip SimplicityCommander-Linux.zip -d /opt/silabs/simplicity-commander
-          rm SimplicityCommander-Linux.zip
-          FILE=$(find /opt/silabs/simplicity-commander/ -name "*Commander_linux_x86_64*")
-          if [ -n "$FILE" ]; then
-            echo "$FILE"
-            tar -xjvf "$FILE" -C /opt/silabs/simplicity-commander
-          else
-            echo "File not found"
-          fi
-
-      - name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
-        uses: carlosperate/arm-none-eabi-gcc-action@v1
-        id: arm-none-eabi-gcc-action
-        with:
-          release: '12.2.Rel1'
-
-      - name: Install ZAP
-        run: |
-          wget https://github.com/project-chip/zap/releases/download/v2024.08.27/zap-linux-x64.zip
-          unzip zap-linux-x64.zip -d /opt/silabs/zap-linux-x64
-          rm zap-linux-x64.zip
+      - name: Install tools
+        uses: ./.github/actions/install-tools
 
       - name: Copy matter_extension to simplicity_sdk and set Matter Extension Environment Variable
         run: |

diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -74,9 +74,8 @@ jobs:
     strategy:
       matrix:
         # Every app builds for every board and suffix
-        app: [zigbee-matter]
+        app: [zigbee-matter-light]
         board: [brd4187c, brd4116a, brd4117a, brd4118a]
-        suffix: ["light"]      
 
     name: ${{ matrix.app }}-${{ matrix.suffix }} ${{ matrix.board }}