ci: update the test job definitions

.github/manifest/manifest-nanbield.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <default sync-j="2"/>
+
+  <remote fetch="https://git.openembedded.org/" name="oe"/>
+  <remote fetch="https://git.yoctoproject.org/git/" name="yocto"/>
+  <remote fetch="https://github.com" name="github"/>
+  <remote fetch="https://github.com/Igalia" name="igalia"/>
+  <remote fetch="https://gitlab.com" name="gitlab"/>
+  <remote fetch="http://code.qt.io/yocto" name="qt"/>
+
+  <project remote="oe" revision="nanbield" name="meta-openembedded" path="sources/meta-openembedded"/>
+
+  <project remote="yocto" revision="nanbield" name="poky" path="sources/poky"/>
+  <project remote="yocto" revision="nanbield" name="meta-raspberrypi" path="sources/meta-raspberrypi"/>
+
+  <project remote="igalia" revision="main" name="meta-webkit.git" path="sources/meta-webkit"/>
+
+  <!-- meta-qt5: master:526b61e10908f733701c2bf0e4db629b428c0384 -->
+  <project remote="qt" revision="526b61e10908f733701c2bf0e4db629b428c0384" name="meta-qt5.git" path="sources/meta-qt5"/>
+</manifest>

.github/workflows/test-build.yml

@@ -38,42 +38,42 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-build
         with:
-          bitbake_source: 'raspberrypi3-mesa-wpe-2-42 raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v3.wpe-2_42'
+          bitbake_source: 'raspberrypi3-mesa-wpe-2-40 raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v3.wpe-2_42'
           repo_release: 'kirkstone'
     needs: kirkstone-repo
 
-  langdale-repo:
+  nanbield-repo:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-repo
         with:
-          repo_release: 'langdale'
+          repo_release: 'nanbield'
 
-  langdale-raspberrypi3-mesa-weston-wpe-2-42:
+  nanbield-raspberrypi3-mesa-weston-wpe-2-42:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-build
         with:
           bitbake_source: 'raspberrypi3-mesa-wpe-2-42 raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4.wpe-2_42'
-          repo_release: 'langdale'
-    needs: langdale-repo
+          repo_release: 'nanbield'
+    needs: nanbield-repo
 
-  langdale-raspberrypi3-mesa-weston-wpe-qt:
+  nanbield-raspberrypi3-mesa-weston-wpe-qt:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-build
         with:
           bitbake_source: 'raspberrypi3-mesa-wpe-qt raspberrypi3-mesa poky layers.raspberrypi.qt5.webkit conf_v4.wpe-2_42.qt'
-          repo_release: 'langdale'
-    needs: langdale-repo
+          repo_release: 'nanbield'
+    needs: nanbield-repo
 
-  langdale-raspberrypi3-mesa-weston-wpe-musl:
+  nanbield-raspberrypi3-mesa-weston-wpe-musl:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
@@ -82,32 +82,21 @@ jobs:
         with:
           bitbake_source: 'raspberrypi3-mesa-wpe-musl raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4.wpe-2_42'
           bitbake_prefix: 'TCLIBC=musl'
-          repo_release: 'langdale'
-    needs: langdale-repo
+          repo_release: 'nanbield'
+    needs: nanbield-repo
 
-  langdale-raspberrypi3-mesa-weston-wpe-2-36:
+  nanbield-raspberrypi3-mesa-weston-wpe-2-40:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-build
         with:
-          bitbake_source: 'raspberrypi3-mesa-wpe-2-36 raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4.wpe-2_36'
-          repo_release: 'langdale'
-    needs: langdale-repo
+          bitbake_source: 'raspberrypi3-mesa-wpe-2-40 raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4.wpe-2_40'
+          repo_release: 'nanbield'
+    needs: nanbield-repo
 
-  langdale-raspberrypi4-64-weston-wpe-2-42:
-    runs-on: self-hosted
-    if: "!contains(github.event.head_commit.message, 'ci skip')"
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/bitbake-build
-        with:
-          bitbake_source: 'raspberrypi4-64-wpe-2-42 raspberrypi4-64 poky layers.raspberrypi.webkit conf_v4.wpe-2_42'
-          repo_release: 'langdale'
-    needs: langdale-repo
-
-  langdale-raspberrypi3-mesa-weston-gtk:
+  nanbield-raspberrypi3-mesa-weston-gtk:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
@@ -116,44 +105,16 @@ jobs:
         with:
           bitbake_source: 'raspberrypi3-mesa-webkitgtk raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4'
           bitbake_target: 'webkitgtk'
-          repo_release: 'langdale'
-    needs: langdale-repo
-
-  mickledore-repo:
-    runs-on: self-hosted
-    if: "!contains(github.event.head_commit.message, 'ci skip')"
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/bitbake-repo
-        with:
-          repo_release: 'mickledore'
+          repo_release: 'nanbield'
+    needs: nanbield-repo
 
-  mickledore-raspberrypi3-mesa-weston-wpe-2-42:
+  nanbield-raspberrypi4-64-weston-wpe-2-42:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-build
         with:
-          bitbake_source: 'raspberrypi3-mesa-wpe-2-42 raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4.wpe-2_42'
-          repo_release: 'mickledore'
-    needs: mickledore-repo
-
-  matrix-kirkstone-wpe-2-40:
-    strategy:
-      fail-fast: false
-      matrix:
-        # note that it's "raspberrypi3-mesa" but "raspberrypi4-64-mesa" doesn't work, "-mesa" has to be removed
-        machine: ['raspberrypi3-mesa', 'raspberrypi4-64']
-        wpe_vers: ['2_40']
-        yocto_rel: ['kirkstone']
-    continue-on-error: true
-    runs-on: self-hosted
-    if: "!contains(github.event.head_commit.message, 'ci skip')"
-    needs: kirkstone-repo
-    steps:
-      #- uses: actions/checkout@v3
-      - uses: ./.github/actions/bitbake-build
-        with:
-          bitbake_source: '${{ matrix.machine }}-wpe-${{ matrix.wpe_vers }} ${{ matrix.machine }} poky layers.raspberrypi.webkit conf_v3.wpe-${{ matrix.wpe_vers }} --update-config'
-          repo_release: ${{ matrix.yocto_rel }}
+          bitbake_source: 'raspberrypi4-64-wpe-2-42 raspberrypi4-64 poky layers.raspberrypi.webkit conf_v4.wpe-2_42'
+          repo_release: 'nanbield'
+    needs: nanbield-repo