add android64 action

This commit is contained in:
mat 2024-01-01 18:58:25 -03:00 committed by GitHub
parent 8e891c7e4f
commit a2e04085df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -47,9 +47,9 @@ jobs:
# package_cmd: './installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg'
# installer_path: './installer/mac/geode-installer-mac.pkg'
- name: Android
- name: Android32
os: ubuntu-latest
id: android
id: android32
cli_id: linux
extra_flags: >
-DCMAKE_TOOLCHAIN_FILE=$NDK_HOME/build/cmake/android.toolchain.cmake
@ -61,6 +61,20 @@ jobs:
package_cmd: ''
installer_path: ''
- name: Android64
os: ubuntu-latest
id: android64
cli_id: linux
extra_flags: >
-DCMAKE_TOOLCHAIN_FILE=$NDK_HOME/build/cmake/android.toolchain.cmake
-DANDROID_ABI=arm64-v8a
-DANDROID_PLATFORM=android-23
-DGEODE_DONT_BUILD_TEST_MODS=1
-G Ninja
cli_cmd: 'chmod +x $GITHUB_WORKSPACE/cli/geode'
package_cmd: ''
installer_path: ''
name: Build ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}
@ -89,7 +103,7 @@ jobs:
with:
ndk-version: r26b
add-to-path: false
if: matrix.config.id == 'android'
if: matrix.config.id == 'android32' || matrix.config.id == 'android64'
- name: Download CLI
uses: robinraju/release-downloader@v1.8
@ -111,7 +125,7 @@ jobs:
run: |
echo "NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"
sudo apt install ninja-build
if: matrix.config.id == 'android'
if: matrix.config.id == 'android32' || matrix.config.id == 'android64'
- name: Configure
run: >
@ -133,14 +147,14 @@ jobs:
- name: Package Installer
run: ${{ matrix.config.package_cmd }}
if: matrix.config.id != 'android'
if: matrix.config.installer_path != ''
- name: Upload Installer
uses: actions/upload-artifact@v3
with:
name: geode-installer-${{ matrix.config.id }}
path: ${{ matrix.config.installer_path }}
if: matrix.config.id != 'android'
if: matrix.config.installer_path != ''
publish:
name: Publish
@ -180,12 +194,18 @@ jobs:
files: geode-win/XInput9_1_0.dll geode-win/Geode.dll geode-win/GeodeUpdater.exe geode-win/Geode.lib geode-win/Geode.pdb
dest: geode-${{ steps.ref.outputs.hash }}-win.zip
- name: Zip Android Artifacts
- name: Zip Android32 Artifacts
uses: vimtor/action-zip@v1.1
with:
files: geode-android/Geode.armeabi-v7a.so
files: geode-android32/Geode.armeabi-v7a.so
dest: geode-${{ steps.ref.outputs.hash }}-android32.zip
- name: Zip Android64 Artifacts
uses: vimtor/action-zip@v1.1
with:
files: geode-android64/Geode.arm64-v8a.so
dest: geode-${{ steps.ref.outputs.hash }}-android64.zip
- name: Zip Resources
uses: vimtor/action-zip@v1.1
with:
@ -205,6 +225,7 @@ jobs:
./geode-installer-${{ steps.ref.outputs.hash }}-win.exe
./geode-${{ steps.ref.outputs.hash }}-win.zip
./geode-${{ steps.ref.outputs.hash }}-android32.zip
./geode-${{ steps.ref.outputs.hash }}-android64.zip
./resources.zip
# TODO: add these back: