Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/android-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Android Build APK
run-name: Android Build APK (${{ inputs.architecture || 'arm64' }} testmode=${{ inputs.testmode || 'false' }})
run-name: Android Build APK (${{ inputs.architecture || 'arm64' }} statusq_testmode=${{ inputs.statusq_testmode || 'false' }})

on:
workflow_dispatch:
Expand All @@ -14,7 +14,7 @@ on:
- 'x86_64'
- 'arm'
- 'x86'
testmode:
statusq_testmode:
description: 'Enable QML test hooks (STATUSQ_TESTMODE)'
required: false
default: 'false'
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:

echo "QT_ANDROID_PATH=$QT_ANDROID_PATH" >> $GITHUB_ENV
echo "ANDROID_ABI=$ANDROID_ABI" >> $GITHUB_ENV
echo "TESTMODE=${{ inputs.testmode }}" >> $GITHUB_ENV
echo "STATUSQ_TESTMODE=${{ inputs.statusq_testmode }}" >> $GITHUB_ENV
echo "ARCH=${{ inputs.architecture }}" >> $GITHUB_ENV

echo "PKG_CONFIG_PATH=$QT_ANDROID_PATH/lib/pkgconfig" >> $GITHUB_ENV
Expand Down Expand Up @@ -126,12 +126,12 @@ jobs:
set -e
unset GOARCH
echo "Using QMAKE: $QMAKE"
echo "STATUSQ_TESTMODE: $TESTMODE"
echo "STATUSQ_TESTMODE: $STATUSQ_TESTMODE"
make mobile-clean
make mobile-build \
V=${{ inputs.verbosity }} \
USE_SYSTEM_NIM=1 \
STATUSQ_TESTMODE=${{ env.TESTMODE }} \
STATUSQ_TESTMODE=${{ env.STATUSQ_TESTMODE }} \
-j$(nproc)

- name: Rename APK with version
Expand Down
2 changes: 1 addition & 1 deletion mobile/scripts/buildStatusQ.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cmake -S "${STATUSQ}" -B "${BUILD_DIR}" \
-DSTATUSQ_BUILD_SANITY_CHECKER=OFF \
-DSTATUSQ_BUILD_TESTS=OFF \
-DSTATUSQ_STATIC_LIB=${STATIC_LIB} \
-DSTATUSQ_TESTMODE=$([[ "${TESTMODE}" == "true" ]] && echo ON || echo OFF)
-DSTATUSQ_TESTMODE=$([[ "${STATUSQ_TESTMODE}" == "true" ]] && echo ON || echo OFF)

make -C "${BUILD_DIR}" qzxing -j "$(nproc)"
make -C "${BUILD_DIR}" StatusQ -j "$(nproc)"
Expand Down