From 3b80ab6823fd7d6f7a1b9cc4daaca39116cfaed6 Mon Sep 17 00:00:00 2001 From: Thaumy Date: Thu, 11 Jan 2024 16:11:17 +0800 Subject: [PATCH] fix ci --- .github/actions/build/action.yml | 7 +++++-- .github/workflows/build-dev.yml | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 444d1c6..a1de0fc 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -7,14 +7,17 @@ inputs: target: description: Build for the target triple required: true + feature: + description: Build feature + required: true runs: using: composite steps: - name: Build dev if: ${{ inputs.release == 'false' }} shell: bash - run: cargo build --target ${{ inputs.target }} + run: cargo build --target ${{ inputs.target }} --features ${{ inputs.feature }} - name: Build release if: ${{ inputs.release == 'true' }} shell: bash - run: cargo build --target ${{ inputs.target }} -r \ No newline at end of file + run: cargo build --target ${{ inputs.target }} --features ${{ inputs.feature }} -r \ No newline at end of file diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index f052018..0a0b249 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -21,11 +21,11 @@ jobs: matrix: target: - { os: ubuntu-22.04, triple: x86_64-unknown-linux-gnu , alias: amd64-gnu-ubuntu-22.04 } - - { os: ubuntu-22.04, triple: x86_64-unknown-linux-musl, alias: amd64-musl-ubuntu-22.04 } + #- { os: ubuntu-22.04, triple: x86_64-unknown-linux-musl, alias: amd64-musl-ubuntu-22.04 } linux-headers: - - { pkg: linux-headers-5.15.0-91-generic, install-path: /usr/src/linux-headers-5.15.0-90-generic, alias: 5.15 } - - { pkg: linux-headers-5.19.0-50-generic, install-path: /usr/src/linux-headers-5.19.0-50-generic, alias: 5.19 } - - { pkg: linux-headers-6.2.0-39-generic , install-path: /usr/src/linux-headers-6.2.0-39-generic , alias: 6.2 } + #- { pkg: linux-headers-5.15.0-91-generic, install-path: /usr/src/linux-headers-5.15.0-90-generic, alias: 5.15 } + #- { pkg: linux-headers-5.19.0-50-generic, install-path: /usr/src/linux-headers-5.19.0-50-generic, alias: 5.19 } + #- { pkg: linux-headers-6.2.0-39-generic , install-path: /usr/src/linux-headers-6.2.0-39-generic , alias: 6.2 } - { pkg: linux-headers-6.5.0-14-generic , install-path: /usr/src/linux-headers-6.5.0-14-generic , alias: 6.5 } steps: @@ -62,7 +62,7 @@ jobs: - name: Setup LINUX_HEADERS_PATH shell: bash - run: export LINUX_HEADERS_PATH="${{ matrix.linux-headers.install-path }}" + run: export LINUX_HEADERS_PATH=${{ matrix.linux-headers.install-path }} - name: Add target uses: ./.github/actions/add-target