Browse Source

Build/Drop android APKs

Drop APKs
Update
QGC4.4
Don Gagne 3 years ago committed by Don Gagne
parent
commit
e58c30744e
  1. 6
      .github/workflows/android_32_release.yml
  2. 122
      .github/workflows/android_64_release.yml
  3. 27
      .github/workflows/android_build.yml.save
  4. 3
      QGCCommon.pri
  5. 4
      QGCPostLinkInstaller.pri

6
.github/workflows/android_release.yml → .github/workflows/android_32_release.yml

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
name: Android Release
name: Android 32-bit Release
on:
push:
@ -15,7 +15,7 @@ defaults: @@ -15,7 +15,7 @@ defaults:
env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 5.15.2
ARTIFACT: QGroundControl.aab
ARTIFACT: QGroundControl32.apk
jobs:
build:
@ -101,7 +101,7 @@ jobs: @@ -101,7 +101,7 @@ jobs:
echo "Daily build" &&
export STABLE_OR_DAILY=DailyBuild;
fi
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} CONFIG+=installer ANDROID_ABIS="armeabi-v7a arm64-v8a"
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} CONFIG+=installer ANDROID_ABIS="armeabi-v7a"
make -j2
- name: ccache post-run

122
.github/workflows/android_64_release.yml

@ -0,0 +1,122 @@ @@ -0,0 +1,122 @@
name: Android 64-bit Release
on:
push:
branches:
- 'master'
pull_request:
branches:
- '*'
defaults:
run:
shell: bash
env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 5.15.2
ARTIFACT: QGroundControl64.apk
jobs:
build:
runs-on: ubuntu-20.04
steps:
- name: Checkout repo
uses: actions/checkout@v2
with:
submodules: recursive
- name: Get all tags for correct version determination
working-directory: ${{ github.workspace }}
run: |
git fetch --unshallow
git fetch --all --tags
- name: Install Qt
uses: jurplel/install-qt-action@v2
with:
version: ${{ env.QT_VERSION }}
host: linux
target: android
dir: ${{ runner.temp }}
modules: qtcharts
setup-python: true
- name: Install ccache
run: sudo apt-get install ccache
- name: Prepare ccache timestamp
id: ccache_cache_timestamp
shell: cmake -P {0}
run: |
string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
message("::set-output name=timestamp::${current_date}")
- name: ccache cache files
uses: actions/cache@v2
with:
path: ~/.ccache
key: ${{ runner.os }}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
restore-keys: ${{ runner.os }}-ccache-
- name: Setup ccache
run: |
mkdir -p ~/.ccache
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
echo "compression = true" >> ~/.ccache/ccache.conf
echo "compression_level = 5" >> ~/.ccache/ccache.conf
ccache -s
ccache -z
- name: Create build directory
run: mkdir ${{ runner.temp }}/shadow_build_dir
- name: Install gstreamer
working-directory: ${{ github.workspace }}
run: |
wget --quiet https://gstreamer.freedesktop.org/data/pkg/android/1.18.5/gstreamer-1.0-android-universal-1.18.5.tar.xz
mkdir gstreamer-1.0-android-universal-1.18.5
tar xf gstreamer-1.0-android-universal-1.18.5.tar.xz -C gstreamer-1.0-android-universal-1.18.5
- name: Git branch name
id: git-branch-name
uses: EthanSK/git-branch-name-action@v1
- name: Update android manifest
run: |
if [ $GIT_BRANCH_NAME != "Stable*" ]; then
${SOURCE_DIR}/tools/update_android_manifest_package.sh ${GIT_BRANCH_NAME}
fi
- name: Build
working-directory: ${{ runner.temp }}/shadow_build_dir
env:
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
run: |
if [ $GIT_BRANCH_NAME == "Stable*" ]; then
echo "Stable build" &&
export STABLE_OR_DAILY=StableBuild;
else
echo "Daily build" &&
export STABLE_OR_DAILY=DailyBuild;
fi
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} CONFIG+=installer ANDROID_ABIS="arm64-v8a"
make -j2
- name: ccache post-run
run: ccache -s
- name: Save artifact
uses: actions/upload-artifact@master
with:
name: ${{ env.ARTIFACT }}
path: ${{ runner.temp }}/shadow_build_dir/package/${{ env.ARTIFACT }}
- name: Upload to S3 Bucket
if: github.event_name == 'push'
working-directory: ${{ runner.temp }}/shadow_build_dir/package
run: |
aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws s3 cp ${ARTIFACT} s3://qgroundcontrol/builds/master/${ARTIFACT} --region us-west-2 --acl public-read

27
.github/workflows/android_build.yml.save

@ -1,27 +0,0 @@ @@ -1,27 +0,0 @@
name: Android build
on: [push, pull_request]
defaults:
run:
shell: bash
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2
with:
submodules: recursive
- name: Build
run: |
mkdir build
sudo docker run -t --mount type=bind,source=$PWD,target=/home/user/qgroundcontrol --user root williangalvani/qgc-android-build
- name: Save artifact
uses: actions/upload-artifact@master
with:
name: QGroundControl.apk
path: build/dist/build/outputs/apk/dist-release-unsigned.apk

3
QGCCommon.pri

@ -258,9 +258,6 @@ installer { @@ -258,9 +258,6 @@ installer {
CONFIG -= debug
CONFIG -= debug_and_release
CONFIG += release
AndroidBuild {
#ANDROID_ABIS = "armeabi-v7a arm64-v8a"
}
message(Build Installer)
}

4
QGCPostLinkInstaller.pri

@ -62,8 +62,8 @@ installer { @@ -62,8 +62,8 @@ installer {
} else {
QMAKE_POST_LINK += && mkdir -p package
QMAKE_POST_LINK += && make apk_install_target INSTALL_ROOT=android-build/
QMAKE_POST_LINK += && androiddeployqt --verbose --input android-QGroundControl-deployment-settings.json --output android-build --release --aab --sign $${SOURCE_DIR}/android/android_release.keystore QGCAndroidKeyStore --storepass $$(ANDROID_KEYSTORE_PASSWORD)
QMAKE_POST_LINK += && cp android-build/build/outputs/bundle/release/android-build-release.aab package/QGroundControl.aab
QMAKE_POST_LINK += && androiddeployqt --verbose --input android-QGroundControl-deployment-settings.json --output android-build --release --sign $${SOURCE_DIR}/android/android_release.keystore QGCAndroidKeyStore --storepass $$(ANDROID_KEYSTORE_PASSWORD)
QMAKE_POST_LINK += && cp android-build/build/outputs/apk/release/android-build-release-signed.apk package/QGroundControl.apk
}
}
}

Loading…
Cancel
Save