ci/cd: Adjust actions for new envsetup syntax

Signed-off-by: Khem Raj <[email protected]>
YoeDistro · Mar 2, 2023 · 51b15a0 · 51b15a0
1 parent 2a39ace
commit 51b15a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -41,8 +41,8 @@ jobs:
           /bin/bash -c "sed -i -e 's/SDK_UPDATE_URL.*$//' conf/site.conf"
       - name: Build Images
         run: |
-          /bin/bash -c ". ./beaglebone-envsetup.sh && bitbake yoe-qt5-image"
-          /bin/bash -c ". ./raspberrypi4-64-envsetup.sh && bitbake yoe-qt5-image"
+          /bin/bash -c ". ./envsetup.sh beaglebone&& bitbake yoe-qt5-image"
+          /bin/bash -c ". ./envsetup.sh rpi4-64 && bitbake yoe-qt5-image"
       - name: ver
         run: echo "ver=$(printf ' - ' && cat sources/meta-yoe/conf/distro/yoe.inc | grep 'DISTRO_CODENAME =' | cut -d' ' -f 3 )" >> $GITHUB_OUTPUT
         id: ver

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -48,15 +48,15 @@ jobs:
           /bin/bash -c "sed -i -e 's/SDK_UPDATE_URL.*$//' conf/site.conf"
       - name: Build Image
         run: |
-          /bin/bash -c ". ./qemuarm64-envsetup.sh && bitbake yoe-qt5-image"
+          /bin/bash -c ". ./envsetup.sh qemuarm64 && bitbake yoe-qt5-image"
       - name: Test Image
         run: |
           export DISPLAY=":0"
           echo TESTIMAGE_AUTO_qemuall = \"1\" >> conf/local.conf
-          /bin/bash -c ". ./qemuarm64-envsetup.sh && bitbake yoe-sdk-image"
+          /bin/bash -c ". ./envsetup.sh qemuarm64 && bitbake yoe-sdk-image"
       - name: Prepare results
         run: |
-          /bin/bash -c ". ./qemuarm64-envsetup.sh && resulttool report build/tmp/log/oeqa"
+          /bin/bash -c ". ./envsetup.sh qemuarm64 && resulttool report build/tmp/log/oeqa"
       - name: Clean shared state
         run: |
-          /bin/bash -c ". ./qemuarm64-envsetup.sh && ./sources/poky/scripts/sstate-cache-management.sh -d -y"
+          /bin/bash -c ". ./envsetup.sh qemuarm64 && ./sources/poky/scripts/sstate-cache-management.sh -d -y"