Browse Source

Merge pull request #6757 from julek-wolfssl/zephyr-ci

Tie zephyr tests to a release
András Fekete 9 months ago
parent
commit
fc4e4f1238
2 changed files with 11 additions and 6 deletions
  1. 2 2
      .github/workflows/main.yml
  2. 9 4
      .github/workflows/zephyr.yml

+ 2 - 2
.github/workflows/main.yml

@@ -28,8 +28,8 @@ jobs:
         uses: ./.github/workflows/hostap.yml
     nginx:
         uses: ./.github/workflows/nginx.yml
-#    zephyr:
-#        uses: ./.github/workflows/zephyr.yml
+    zephyr:
+        uses: ./.github/workflows/zephyr.yml
     hitch:
         uses: ./.github/workflows/hitch.yml
     curl:

+ 9 - 4
.github/workflows/zephyr.yml

@@ -6,6 +6,11 @@ on:
 jobs:
   run_test:
     name: Build and run
+    strategy:
+      matrix:
+        config:
+          - zephyr-ref: v3.4.0
+            zephyr-sdk: 0.16.1
     runs-on: ubuntu-latest
     # This should be a safe limit for the tests to run.
     timeout-minutes: 15
@@ -33,7 +38,7 @@ jobs:
         run: sudo pip install west
 
       - name: Init west workspace
-        run: west init zephyr
+        run: west init --mr ${{ matrix.config.zephyr-ref }} zephyr
 
       - name: Update west.yml
         working-directory: zephyr/zephyr
@@ -56,9 +61,9 @@ jobs:
 
       - name: Install zephyr SDK
         run: |
-          wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64.tar.xz
-          tar xf zephyr-sdk-0.16.1_linux-x86_64.tar.xz
-          cd zephyr-sdk-0.16.1
+          wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{ matrix.config.zephyr-sdk }}/zephyr-sdk-${{ matrix.config.zephyr-sdk }}_linux-x86_64.tar.xz
+          tar xf zephyr-sdk-${{ matrix.config.zephyr-sdk }}_linux-x86_64.tar.xz
+          cd zephyr-sdk-${{ matrix.config.zephyr-sdk }}
           ./setup.sh -h -c
 
       - name: Run wolfssl test