diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23bc1f7..7bd41a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,16 @@ jobs: runs-on: ubuntu-latest + strategy: + matrix: + platform: + - vcpkg_toolkit: arm-neon-android + ndk_abi: armeabi-v7a + - vcpkg_toolkit: arm64-android + ndk_abi: arm64-v8a + - vcpkg_toolkit: x64-android + ndk_abi: x86_64 + steps: - uses: actions/checkout@v4 with: @@ -55,23 +65,20 @@ jobs: distribution: 'temurin' java-version: '17' - - name: update vcpkg - run: | - git clone https://github.com/microsoft/vcpkg.git - - name: Install Dependencies (host) run: sudo apt update && sudo apt -y install cmake pkg-config nasm - name: Install Dependencies (target) env: ANDROID_NDK_HOME: ${{steps.setup_ndk.outputs.ndk-path}} - run: vcpkg install --triplet arm64-android --overlay-ports=vcpkg/ports libsodium openssl + #run: vcpkg install --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium openssl opus libvpx libpng libjpeg-turbo + run: vcpkg install --triplet ${{matrix.platform.vcpkg_toolkit}} libsodium openssl # vcpkg scripts root /usr/local/share/vcpkg/scripts - name: Configure CMake env: ANDROID_NDK_HOME: ${{steps.setup_ndk.outputs.ndk-path}} - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=arm64-android -DANDROID=1 -DANDROID_PLATFORM=23 -DANDROID_ABI=arm64-v8a -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{steps.setup_ndk.outputs.ndk-path}}/build/cmake/android.toolchain.cmake + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${{matrix.platform.vcpkg_toolkit}} -DANDROID=1 -DANDROID_PLATFORM=23 -DANDROID_ABI=${{matrix.platform.ndk_abi}} -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{steps.setup_ndk.outputs.ndk-path}}/build/cmake/android.toolchain.cmake - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 @@ -79,14 +86,14 @@ jobs: - name: Compress artifacts shell: bash run: | - tar -czvf ${{ github.event.repository.name }}-android-arm64.tar.gz -C ${{github.workspace}}/build/bin/ . + tar -czvf ${{ github.event.repository.name }}-${{matrix.platform.vcpkg_toolkit}}.tar.gz -C ${{github.workspace}}/build/bin/ . - uses: actions/upload-artifact@v4 with: - name: ${{ github.event.repository.name }}-android-arm64 + name: ${{ github.event.repository.name }}-${{matrix.platform.vcpkg_toolkit}} # TODO: do propper packing path: | - ${{github.workspace}}/${{github.event.repository.name}}-android-arm64.tar.gz + ${{github.workspace}}/${{github.event.repository.name}}-${{matrix.platform.vcpkg_toolkit}}.tar.gz macos: timeout-minutes: 10 @@ -121,14 +128,8 @@ jobs: with: submodules: recursive - - name: update vcpkg - shell: bash - run: | - cd C:/vcpkg - git pull - - name: Install Dependencies - run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static + run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static # setup vs env - uses: ilammy/msvc-dev-cmd@v1 @@ -136,7 +137,7 @@ jobs: arch: amd64 - name: Configure CMake - run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSOLANACEAE_ECOSYSTEM_BUILD_TESTING=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static + run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSOLANACEAE_ECOSYSTEM_BUILD_TESTING=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3