From ef53b5a644854095d36309937adae1a7e2ad05ad Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 3 Jul 2021 19:54:56 +0300 Subject: [PATCH] gha: fix android build, last time --- .github/workflows/c-cpp.yml | 9 +++------ scripts/gha/build_android.sh | 4 +++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 64ab2f7a..4950e208 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -57,12 +57,9 @@ jobs: - name: Build engine run: bash scripts/gha/build_${{ matrix.targetos }}.sh - - name: Upload engine (android 32) - if: matrix.targetos == 'android' && matrix.targetarch == '32' - run: bash scripts/continious_upload.sh xashdroid.apk - - name: Upload engine (android 64) - if: matrix.targetos == 'android' && matrix.targetarch == '64' - run: bash scripts/continious_upload.sh xashdroid-64-test.apk + - name: Upload engine (android) + if: matrix.targetos == 'android' + run: bash scripts/continious_upload.sh xashdroid-${{ matrix.targetarch }}.apk - name: Upload engine (motomagx) if: matrix.targetos == 'motomagx' run: bash scripts/continious_upload.sh xash3d-fwgs-magx.7z diff --git a/scripts/gha/build_android.sh b/scripts/gha/build_android.sh index 0942cd01..03b85d7b 100755 --- a/scripts/gha/build_android.sh +++ b/scripts/gha/build_android.sh @@ -20,5 +20,7 @@ export STRIP=llvm-strip-12 sh compile.sh release if [[ "$GH_CPU_ARCH" == "64" ]]; then - mv xashdroid.apk xashdroid-64-test.apk + mv xashdroid.apk ../xashdroid-64.apk +else + mv xashdroid.apk ../xashdroid-32.apk fi