Fix in internal component builds

This commit is contained in:
Kevin Dewald 2025-04-23 17:18:27 -07:00
parent 939dfe09d4
commit 150de5029e

View File

@ -104,6 +104,7 @@ jobs:
cmake-options: '-DBUILD_SHARED_LIBS=OFF'
parallel-jobs: '4'
linux-use-system-dbus: 'true'
build:
runs-on: ubuntu-22.04
needs: [tests, examples]
@ -117,30 +118,34 @@ jobs:
- {container: dockcross/linux-x86, target: linux-x86}
- {container: dockcross/linux-armv6-lts, target: linux-armv6}
library: ${{ fromJSON(inputs.libraries || '["simpledbus","simplebluez"]') }}
type: [static]
container:
image: ${{ matrix.options.container }}
steps:
- name: Clone repository
uses: actions/checkout@v4
- name: Build ${{ matrix.library }}
uses: ./.github/actions/build-native
with:
os: 'linux'
source-dir: '$(pwd)/${{ matrix.library }}'
build-dir: '$(pwd)/build_${{ matrix.library }}'
install-prefix: '$(pwd)/build_${{ matrix.library }}/install'
build-config: 'Release'
cmake-options: '-DCMAKE_PREFIX_PATH=/tmp/dbus/install:${CMAKE_PREFIX_PATH}'
parallel-jobs: '4'
linux-use-system-dbus: 'true'
- name: Package and Upload
shell: bash
run: |
mkdir -p $(pwd)/artifacts
zip -r $(pwd)/artifacts/${{ matrix.library }}_${{ matrix.type }}_${{ matrix.options.target }}.zip $(pwd)/build_${{ matrix.library }}/install
- name: Upload binaries to job
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.library }}_${{ matrix.type }}_${{ matrix.options.target }}
path: artifacts/${{ matrix.library }}_${{ matrix.type }}_${{ matrix.options.target }}.zip
- name: Clone Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- name: Add Version Suffix
uses: ./.github/actions/setup-version
- name: Build ${{ matrix.library }}
uses: ./.github/actions/build-native
with:
os: 'linux'
source-dir: '$GITHUB_WORKSPACE/${{ matrix.library }}'
build-dir: '$GITHUB_WORKSPACE/build_${{ matrix.library }}'
install-prefix: '$GITHUB_WORKSPACE/build_${{ matrix.library }}/install'
build-config: 'Release'
cmake-options: '-DBUILD_SHARED_LIBS=OFF'
# - name: Package and Upload
# shell: bash
# run: |
# mkdir -p $(pwd)/artifacts
# zip -r $(pwd)/artifacts/${{ matrix.library }}_${{ matrix.type }}_${{ matrix.options.target }}.zip $(pwd)/build_${{ matrix.library }}/install
# - name: Upload binaries to job
# uses: actions/upload-artifact@v4
# with:
# name: ${{ matrix.library }}_${{ matrix.type }}_${{ matrix.options.target }}
# path: artifacts/${{ matrix.library }}_${{ matrix.type }}_${{ matrix.options.target }}.zip