diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 178a949..4c8271d 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -14,7 +14,7 @@ jobs: linux-ubuntu: timeout-minutes: 10 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -46,15 +46,15 @@ jobs: - name: Compress artifacts shell: bash run: | - tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ . + tar -czvf ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64.tar.gz -C ${{github.workspace}}/build/bin/ . - uses: actions/upload-artifact@v4 with: # TODO: simpler name? - name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64 + name: ${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64 # TODO: do propper packing path: | - ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu20.04-x86_64.tar.gz + ${{github.workspace}}/${{ github.event.repository.name }}-${{ steps.tag.outputs.name }}-${{ runner.os }}-ubuntu22.04-x86_64.tar.gz windows: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4ec538..c2a46d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,11 +42,11 @@ jobs: strategy: matrix: platform: - - vcpkg_toolkit: arm-neon-android + - vcpkg_toolkit: arm-neon-android-23 ndk_abi: armeabi-v7a - - vcpkg_toolkit: arm64-android + - vcpkg_toolkit: arm64-android-23 ndk_abi: arm64-v8a - - vcpkg_toolkit: x64-android + - vcpkg_toolkit: x64-android-23 ndk_abi: x86_64 steps: @@ -54,6 +54,11 @@ jobs: with: submodules: recursive + - uses: actions/checkout@v4 + with: + repository: 'Green-Sky/vcpkg_android_triplets' + path: 'vcpkg_android_triplets' + - uses: nttld/setup-ndk@v1 id: setup_ndk with: