ci: Ensure twister steps use the bsim version from the manifest

The west manifest may point to a newer version of bsim than the one avaliable in the docker image. Let's ensure we run with that one. This is equivalent to the change done in 933d338 for the bsim-tests workflow. Note that the update and rebuild is incremental, so if the docker image already has the right version the operation is very fast (~1 second) Signed-off-by: Alberto Escolar Piedras <[email protected]>
zephyrproject-rtos · Mar 15, 2024 · 5158ea4 · 5158ea4
1 parent cb0a123
commit 5158ea4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml
@@ -89,6 +89,17 @@ jobs:
           ccache -p
           ccache -z -s -vv
 
+      - name: Update BabbleSim to manifest revision
+        run: |
+          export BSIM_VERSION=$( west list bsim -f {revision} )
+          echo "Manifest points to bsim sha $BSIM_VERSION"
+          cd /opt/bsim_west/bsim
+          git fetch -n origin ${BSIM_VERSION}
+          git config --global advice.detachedHead false
+          git checkout ${BSIM_VERSION}
+          west update
+          make everything -s -j 8
+
       - name: Run Tests with Twister
         id: twister
         run: |

diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -85,6 +85,17 @@ jobs:
           ccache -p
           ccache -z -s -vv
 
+      - name: Update BabbleSim to manifest revision
+        run: |
+          export BSIM_VERSION=$( west list bsim -f {revision} )
+          echo "Manifest points to bsim sha $BSIM_VERSION"
+          cd /opt/bsim_west/bsim
+          git fetch -n origin ${BSIM_VERSION}
+          git config --global advice.detachedHead false
+          git checkout ${BSIM_VERSION}
+          west update
+          make everything -s -j 8
+
       - name: Run Tests with Twister (Push)
         continue-on-error: true
         run: |

diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml
@@ -213,6 +213,17 @@ jobs:
           ccache -p
           ccache -z -s -vv
 
+      - name: Update BabbleSim to manifest revision
+        run: |
+          export BSIM_VERSION=$( west list bsim -f {revision} )
+          echo "Manifest points to bsim sha $BSIM_VERSION"
+          cd /opt/bsim_west/bsim
+          git fetch -n origin ${BSIM_VERSION}
+          git config --global advice.detachedHead false
+          git checkout ${BSIM_VERSION}
+          west update
+          make everything -s -j 8
+
       - if: github.event_name == 'push'
         name: Run Tests with Twister (Push)
         run: |