CI update

Signed-off-by: Joel Winarske <joel.winarske@toyotaconnected.com>
toyota-connected · Aug 26, 2024 · d2bddcf · d2bddcf
1 parent 08ac4bf
commit d2bddcf
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 253 deletions.
diff --git a/.github/workflows/oss-codeql.yml b/.github/workflows/oss-codeql.yml
@@ -2,7 +2,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ 'main', 'agl' ]
+    branches: [ 'v2.0' ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ 'main' ]
@@ -28,22 +28,22 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: 'true'
 
     - name: Install packages
       run: |
         echo ${{ github.server_url }}
-        sudo apt-get -y install \
+        sudo apt-get -y install ninja-build \
         libwayland-dev wayland-protocols libxkbcommon-dev \
         mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev mesa-utils
         cmake --version
         gcc --version
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     - name: Configure
       run: |
         mkdir -p ${{github.workspace}}/build/release
-        cmake \
+        cmake -GNinja \
           -B ${{github.workspace}}/build/release \
           -D CMAKE_BUILD_TYPE=Release \
           -D CMAKE_STAGING_PREFIX=${{github.workspace}}/build/staging/usr/local \
@@ -66,10 +66,10 @@ jobs:
       working-directory: ${{github.workspace}}/build/release
       run: |
         rm -rf _packages || true
-        make package
-        ls -la _packages
+        ninja -C . ivi-homescreen
+        ls -la shell/homescreen
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/oss-flutter-auto.yml b/.github/workflows/oss-flutter-auto.yml
diff --git a/.github/workflows/oss-ivi-homescreen.yml b/.github/workflows/oss-ivi-homescreen.yml
@@ -11,23 +11,20 @@ on:
     # daily
     - cron:  '0 0 * * *'
 
-env:
-  COMPONENT: ivi-homescreen
-
 jobs:
   ivi-homescreen:
     if: ${{ github.server_url == 'https://github.com' && github.ref != 'refs/heads/agl' && always() }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'true'
 
       - name: Install packages
         run: |
           echo ${{ github.server_url }}
-          sudo apt-get -y install \
+          sudo apt-get -y install ninja-build \
           libwayland-dev wayland-protocols libxkbcommon-dev \
           mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev mesa-utils
           cmake --version
@@ -36,7 +33,7 @@ jobs:
       - name: Configure Debug
         run: |
           mkdir -p ${{github.workspace}}/build/debug
-          cmake \
+          cmake -GNinja \
             -B ${{github.workspace}}/build/debug \
             -D CMAKE_BUILD_TYPE=Debug \
             -D CMAKE_STAGING_PREFIX=${{github.workspace}}/build/staging/usr/local \
@@ -47,35 +44,34 @@ jobs:
         working-directory: ${{github.workspace}}/build/debug
         run: |
           rm -rf _packages || true
-          make homescreen VERBOSE=1
-          make package VERBOSE=1
+          ninja -C . package
           ls -la _packages
 
       - name: Publish Debug Artifact TGZ
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ivi-homescreen-dbg.Linux.tar.gz.zip
+          name: homescreen-dbg.Linux.tar.gz.zip
           path: |
-            build/debug/_packages/ivi-homescreen-dbg-*-Linux.tar.gz
+            build/debug/_packages/homescreen-dbg-*-Linux.tar.gz
 
       - name: Publish Debug Artifact Debian
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ivi-homescreen-dbg.amd64.deb.zip
+          name: homescreen-dbg.amd64.deb.zip
           path: |
-            build/debug/_packages/ivi-homescreen-dbg*_amd64.*deb
+            build/debug/_packages/homescreen-dbg*_amd64.*deb
 
       - name: Publish Debug Artifact RPM
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ivi-homescreen-dbg.x86_64.rpm.zip
+          name: homescreen-dbg.x86_64.rpm.zip
           path: |
-            build/debug/_packages/ivi-homescreen-dbg-*.x86_64.rpm
+            build/debug/_packages/homescreen-dbg-*.x86_64.rpm
 
       - name: Configure Release
         run: |
           mkdir -p ${{github.workspace}}/build/release
-          cmake \
+          cmake -GNinja \
             -B ${{github.workspace}}/build/release \
             -D CMAKE_BUILD_TYPE=Release \
             -D CMAKE_STAGING_PREFIX=${{github.workspace}}/build/staging/usr/local \
@@ -86,8 +82,7 @@ jobs:
         working-directory: ${{github.workspace}}/build/release
         run: |
           rm -rf _packages || true
-          make homescreen VERBOSE=1
-          make package VERBOSE=1
+          ninja -C . package
           ls -la _packages
           echo "Release Info"
           ls -la shell/homescreen
@@ -98,22 +93,22 @@ jobs:
           ldd shell/homescreen
 
       - name: Publish Release Artifact TGZ
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ivi-homescreen.Linux.tar.gz.zip
+          name: homescreen.Linux.tar.gz.zip
           path: |
-            build/release/_packages/ivi-homescreen-*-Linux.tar.gz
+            build/release/_packages/homescreen-*-Linux.tar.gz
 
       - name: Publish Release Artifact Debian
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ivi-homescreen.amd64.deb.zip
+          name: homescreen.amd64.deb.zip
           path: |
-            build/release/_packages/ivi-homescreen_*_amd64.deb
+            build/release/_packages/homescreen_*_amd64.deb
 
       - name: Publish Release Artifact RPM
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ivi-homescreen.x86_64.rpm.zip
+          name: homescreen.x86_64.rpm.zip
           path: |
-            build/release/_packages/ivi-homescreen-*.x86_64.rpm
+            build/release/_packages/homescreen-*.x86_64.rpm