mirror/IronFox
1
0
Fork 0
mirror of https://github.com/ironfox-oss/IronFox.git synced 2026-06-11 01:34:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix - ci: extract our GeckoView AAR artifacts

Browse Source 
Signed-off-by: celenity <celenity@celenity.dev>
This commit is contained in:
celenity
2026-04-04 21:08:13 +00:00
parent e2746a2327
commit 27cc063715
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/build-if.sh
View File

@@ -604,16 +604,9 @@ function build_gecko_x86_64() {
function build_gecko_bundle() {
# Bundle
export MOZ_ANDROID_FAT_AAR_ARCHITECTURES='arm64-v8a,armeabi-v7a,x86_64'
if [ "${IRONFOX_CI}" == 1 ]; then
export MOZ_ANDROID_FAT_AAR_ARM64_V8A="${IRONFOX_AAR_ARTIFACTS}/geckoview-arm64-v8a.zip"
export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A="${IRONFOX_AAR_ARTIFACTS}/geckoview-armeabi-v7a.zip"
export MOZ_ANDROID_FAT_AAR_X86_64="${IRONFOX_AAR_ARTIFACTS}/geckoview-x86_64.zip"
else
export MOZ_ANDROID_FAT_AAR_ARM64_V8A="${IRONFOX_OUTPUTS_GV_AAR_ARM64}"
export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A="${IRONFOX_OUTPUTS_GV_AAR_ARM}"
export MOZ_ANDROID_FAT_AAR_X86_64="${IRONFOX_OUTPUTS_GV_AAR_X86_64}"
fi
export MOZ_ANDROID_FAT_AAR_ARM64_V8A="${IRONFOX_OUTPUTS_GV_AAR_ARM64}"
export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A="${IRONFOX_OUTPUTS_GV_AAR_ARM}"
export MOZ_ANDROID_FAT_AAR_X86_64="${IRONFOX_OUTPUTS_GV_AAR_X86_64}"
pushd "${IRONFOX_GECKO}"
echo_red_text 'Creating GeckoView fat AAR...'

11
scripts/ci-build.sh
View File

@@ -28,6 +28,17 @@ fi
bash -x $(dirname $0)/env.sh
source $(dirname $0)/env.sh
# Extract our GeckoView AAR artifacts
if [ "${BUILD_VARIANT}" == 'bundle' ]; then
"${IRONFOX_TAR}" xvJf "${IRONFOX_ARTIFACTS}/build-aar-arm64.tar.xz" -C "${IRONFOX_DOWNLOADS}/geckoview-arm64"
"${IRONFOX_TAR}" xvJf "${IRONFOX_ARTIFACTS}/build-aar-arm.tar.xz" -C "${IRONFOX_DOWNLOADS}/geckoview-arm"
"${IRONFOX_TAR}" xvJf "${IRONFOX_ARTIFACTS}/build-aar-x86_64.tar.xz" -C "${IRONFOX_DOWNLOADS}/geckoview-x86_64"
cp -vf "${IRONFOX_DOWNLOADS}/geckoview-arm64/aar/geckoview-arm64-v8a.zip" "${IRONFOX_OUTPUTS_GV_AAR_ARM64}"
cp -vf "${IRONFOX_DOWNLOADS}/geckoview-arm/aar/geckoview-armeabi-v7a.zip" "${IRONFOX_OUTPUTS_GV_AAR_ARM}"
cp -vf "${IRONFOX_DOWNLOADS}/geckoview-x86_64/aar/geckoview-x86_64.zip" "${IRONFOX_OUTPUTS_GV_AAR_X86_64}"
fi
# Fail-fast in case the signing key is unavailable or empty file
if ! [[ -f "${IRONFOX_KEYSTORE}" ]]; then
echo_red_text "ERROR: Keystore file ${IRONFOX_KEYSTORE} does not exist!"