Green-Sky/solanaceae_ecosystem
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

update ubuntu ci and copy over android fix from tomato
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
Details
ContinuousDelivery / windows (push) Has been cancelled
Details
ContinuousDelivery / release (push) Has been cancelled
Details
ContinuousIntegration / linux (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / macos (push) Has been cancelled
Details
ContinuousIntegration / windows (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Green Sky 2025-04-19 16:07:58 +02:00
parent c6b98f9be9
commit 4538651608
No known key found for this signature in database
GPG Key ID: DBE05085D874AB4A
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/cd.yml vendored
View File

@ -14,7 +14,7 @@ jobs:
linux-ubuntu: linux-ubuntu:
timeout-minutes: 10 timeout-minutes: 10
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -46,15 +46,15 @@ jobs:
- name: Compress artifacts - name: Compress artifacts
shell: bash shell: bash
run: | 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 - uses: actions/upload-artifact@v4
with: with:
# TODO: simpler name? # 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 # TODO: do propper packing
path: | 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: windows:

11
.github/workflows/ci.yml vendored
View File

@ -42,11 +42,11 @@ jobs:
strategy: strategy:
matrix: matrix:
platform: platform:
- vcpkg_toolkit: arm-neon-android - vcpkg_toolkit: arm-neon-android-23
ndk_abi: armeabi-v7a ndk_abi: armeabi-v7a
- vcpkg_toolkit: arm64-android - vcpkg_toolkit: arm64-android-23
ndk_abi: arm64-v8a ndk_abi: arm64-v8a
- vcpkg_toolkit: x64-android - vcpkg_toolkit: x64-android-23
ndk_abi: x86_64 ndk_abi: x86_64
steps: steps:
@ -54,6 +54,11 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- uses: actions/checkout@v4
with:
repository: 'Green-Sky/vcpkg_android_triplets'
path: 'vcpkg_android_triplets'
- uses: nttld/setup-ndk@v1 - uses: nttld/setup-ndk@v1
id: setup_ndk id: setup_ndk
with: with: