ci: don't build lkm and ksud alone, always build in manager

tiann · Mar 27, 2024 · 511a671 · 511a671
1 parent e51c78a
commit 511a671
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/build-ksud.yml b/.github/workflows/build-ksud.yml
@@ -5,13 +5,11 @@ on:
     paths:
       - '.github/workflows/build-ksud.yml'
       - '.github/workflows/ksud.yml'
-      - 'userspace/ksud/**'
   pull_request:
     branches: [ "main" ]
     paths:
       - '.github/workflows/build-ksud.yml'
       - '.github/workflows/ksud.yml'
-      - 'userspace/ksud/**'
 jobs:
   build-lkm:
     uses: ./.github/workflows/build-lkm.yml

diff --git a/.github/workflows/build-lkm.yml b/.github/workflows/build-lkm.yml
@@ -3,15 +3,11 @@ on:
   push:
     branches: ["main", "ci", "checkci"]
     paths:
-      - ".github/workflows/gki-kernel.yml"
       - ".github/workflows/build-lkm.yml"
-      - "kernel/**"
   pull_request:
     branches: ["main"]
     paths:
-      - ".github/workflows/gki-kernel.yml"
       - ".github/workflows/build-lkm.yml"
-      - "kernel/**"
   workflow_call:
 jobs:
   build-lkm:

diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml
@@ -25,7 +25,19 @@ jobs:
       matrix:
         include:
           - target: aarch64-linux-android
+            os: ubuntu-latest
           - target: x86_64-linux-android
+            os: ubuntu-latest
+          - target: x86_64-pc-windows-gnu # windows pc
+            os: ubuntu-latest
+          - target: x86_64-apple-darwin # Intel mac
+            os: macos-latest
+          - target: aarch64-apple-darwin # M chip mac
+            os: macos-latest
+          - target: aarch64-unknown-linux-musl # arm64 Linux
+            os: ubuntu-latest
+          - target: x86_64-unknown-linux-musl # x86 Linux
+            os: ubuntu-latest
     uses: ./.github/workflows/ksud.yml
     with:
       target: ${{ matrix.target }}