From 511a6718248fd8de3fcd800812d053eec0b26892 Mon Sep 17 00:00:00 2001 From: weishu Date: Wed, 27 Mar 2024 12:42:08 +0800 Subject: [PATCH] ci: don't build lkm and ksud alone, always build in manager --- .github/workflows/build-ksud.yml | 2 -- .github/workflows/build-lkm.yml | 4 ---- .github/workflows/build-manager.yml | 12 ++++++++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ksud.yml b/.github/workflows/build-ksud.yml index 45e853b9..9f2c7088 100644 --- 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 index f9fe6d7c..8f207ce9 100644 --- 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 index dba65a17..a0c7fb19 100644 --- 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 }}