From d5e2fcfa49e1a2363b99dd150d3faad96be95ba7 Mon Sep 17 00:00:00 2001
From: Huaqi Fang <578567190@qq.com>
Date: Tue, 21 May 2024 14:29:56 +0800
Subject: [PATCH] ci: Update github and gitlab ci due to demosoc removal

Signed-off-by: Huaqi Fang <578567190@qq.com>
---
 .github/workflows/build.yml | 10 +++++-----
 .gitlab-ci.yml              | 32 ++++++++++++++++----------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 096374b..fccf709 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        soc: [demosoc, evalsoc]
+        soc: [evalsoc]
         core: [ux900, ux900fd, u900, u900fd]
         boot_mode: [sd, flash]
 
@@ -74,7 +74,7 @@ jobs:
 
       # Build bootimages
       - name: Build bootimages for ${{ matrix.soc }} - ${{ matrix.core }} - ${{ matrix.boot_mode }}
-        if: ${{ !( matrix.soc == 'demosoc' && startsWith(matrix.core, 'u900')) }}
+        if: ${{ !( matrix.soc == 'evalsoc' && startsWith(matrix.core, 'u900')) }}
         run: |
           export SOC=${{ matrix.soc }} CORE=${{ matrix.core }} BOOT_MODE=${{ matrix.boot_mode }}
           echo "Generate QEMU Disk"
@@ -105,7 +105,7 @@ jobs:
 
       # Run on qemu
       - name: Run and test on qemu for ${{ matrix.soc }} - ${{ matrix.core }} - ${{ matrix.boot_mode }}
-        if: ${{ !( matrix.soc == 'demosoc' && startsWith(matrix.core, 'u900')) }}
+        if: ${{ !( matrix.soc == 'evalsoc' && startsWith(matrix.core, 'u900')) }}
         run: |
           QEMU_PATH=$(pwd)/prebuilt_tools/linux_qemu/bin:$(pwd)/prebuilt_tools/qemu/bin
           export PATH=${QEMU_PATH}:$PATH
@@ -122,7 +122,7 @@ jobs:
           }
 
       - name: Upload bootimages for ${{ matrix.soc }} - ${{ matrix.core }} - ${{ matrix.boot_mode }}
-        if: ${{ !( matrix.soc == 'demosoc' && startsWith(matrix.core, 'u900')) }}
+        if: ${{ !( matrix.soc == 'evalsoc' && startsWith(matrix.core, 'u900')) }}
         uses: actions/upload-artifact@v3
         with:
           name: bootimages_${{ matrix.soc }}_${{ matrix.core }}_${{ matrix.boot_mode }}
@@ -132,7 +132,7 @@ jobs:
             work/${{ matrix.soc }}/buildstamp.txt
 
       - name: Upload qemu images for ${{ matrix.soc }} - ${{ matrix.core }} - ${{ matrix.boot_mode }}
-        if: ${{ !( matrix.soc == 'demosoc' && startsWith(matrix.core, 'u900')) }}
+        if: ${{ !( matrix.soc == 'evalsoc' && startsWith(matrix.core, 'u900')) }}
         uses: actions/upload-artifact@v3
         with:
           name: qemu_images_${{ matrix.soc }}_${{ matrix.core }}_${{ matrix.boot_mode }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8c1d35..7ec8254 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -270,13 +270,13 @@ cache:
 build_ux900_flash:
     stage: build
     variables:
-        SOC: "demosoc"
+        SOC: "evalsoc"
         CORE: "ux900"
         ARCH_EXT: ""
         BOOT_MODE: "flash"
     parallel:
         matrix:
-            - SOC: ["demosoc", "evalsoc"]
+            - SOC: ["evalsoc"]
     <<: *build_linux_sdk_job_def
 
 ## Job for build sdk
@@ -284,13 +284,13 @@ build_ux900_flash:
 build_ux900_sd:
     stage: build
     variables:
-        SOC: "demosoc"
+        SOC: "evalsoc"
         CORE: "ux900"
         ARCH_EXT: ""
         BOOT_MODE: "sd"
     parallel:
         matrix:
-            - SOC: ["demosoc", "evalsoc"]
+            - SOC: ["evalsoc"]
     <<: *build_linux_sdk_job_def
 
 # Manual job for ux900 sd
@@ -341,7 +341,7 @@ run_ux900_flash_xlspike:
     dependencies:
         - build_ux900_flash
     variables:
-        SOC: "demosoc"
+        SOC: "evalsoc"
         CORE: "ux900"
         BOOT_MODE: "flash"
     <<: *run_linux_sdk_xlspike_job_def
@@ -353,7 +353,7 @@ run_ux900_sd_xlspike:
     dependencies:
         - build_ux900_sd
     variables:
-        SOC: "demosoc"
+        SOC: "evalsoc"
         CORE: "ux900"
         BOOT_MODE: "sd"
     <<: *run_linux_sdk_xlspike_job_def
@@ -366,7 +366,7 @@ run_ux900_flash_qemu:
         - build_ux900_flash
     parallel:
         matrix:
-            - SOC: ["demosoc", "evalsoc"]
+            - SOC: ["evalsoc"]
     variables:
         CORE: "ux900"
         BOOT_MODE: "flash"
@@ -380,7 +380,7 @@ run_ux900_sd_qemu:
         - build_ux900_sd
     parallel:
         matrix:
-            - SOC: ["demosoc", "evalsoc"]
+            - SOC: ["evalsoc"]
     variables:
         CORE: "ux900"
         BOOT_MODE: "sd"
@@ -392,13 +392,13 @@ build_ux900fd_flash:
     stage: build
     dependencies:
     variables:
-        SOC: "demosoc"
+        SOC: "evalsoc"
         CORE: "ux900fd"
         ARCH_EXT: ""
         BOOT_MODE: "flash"
     parallel:
         matrix:
-            - SOC: ["demosoc", "evalsoc"]
+            - SOC: ["evalsoc"]
     <<: *build_linux_sdk_job_def
 
 ## Job for build sdk
@@ -407,13 +407,13 @@ build_ux900fd_sd:
     stage: build
     dependencies:
     variables:
-        SOC: "demosoc"
+        SOC: "evalsoc"
         CORE: "ux900fd"
         ARCH_EXT: ""
         BOOT_MODE: "sd"
     parallel:
         matrix:
-            - SOC: ["demosoc", "evalsoc"]
+            - SOC: ["evalsoc"]
     <<: *build_linux_sdk_job_def
 
 # Manual job for ux900fd sd
@@ -449,7 +449,7 @@ run_ux900fd_flash_xlspike:
     dependencies:
         - build_ux900fd_flash
     variables:
-        SOC: "demosoc"
+        SOC: "evalsoc"
         CORE: "ux900fd"
         BOOT_MODE: "flash"
     <<: *run_linux_sdk_xlspike_job_def
@@ -463,7 +463,7 @@ run_ux900fd_sd_xlspike:
     dependencies:
         - build_ux900fd_sd
     variables:
-        SOC: "demosoc"
+        SOC: "evalsoc"
         CORE: "ux900fd"
         BOOT_MODE: "sd"
     <<: *run_linux_sdk_xlspike_job_def
@@ -478,7 +478,7 @@ run_ux900fd_flash_qemu:
         - build_ux900fd_flash
     parallel:
         matrix:
-            - SOC: ["demosoc", "evalsoc"]
+            - SOC: ["evalsoc"]
     variables:
         CORE: "ux900fd"
         BOOT_MODE: "flash"
@@ -494,7 +494,7 @@ run_ux900fd_sd_qemu:
         - build_ux900fd_sd
     parallel:
         matrix:
-            - SOC: ["demosoc", "evalsoc"]
+            - SOC: ["evalsoc"]
     variables:
         CORE: "ux900fd"
         BOOT_MODE: "sd"