fix

Signed-off-by: celenity <celenity@celenity.dev>

scripts/build.sh

@@ -26,13 +26,13 @@ if [ "${IRONFOX_LOG_BUILD}" == 1 ]; then
     # Ensure our log directory exists
     mkdir -vp "${IRONFOX_LOG_DIR}"
 
-    # bash -x "${IRONFOX_SCRIPTS}/build-if.sh" "${target}" > >(tee -a "${BUILD_LOG_FILE}") 2>&1
-# else
-    # bash -x "${IRONFOX_SCRIPTS}/build-if.sh" "${target}"
+    bash -x "${IRONFOX_SCRIPTS}/build-if.sh" "${target}" > >(tee -a "${BUILD_LOG_FILE}") 2>&1
+else
+    bash -x "${IRONFOX_SCRIPTS}/build-if.sh" "${target}"
 fi
 
 # Sign IronFox
-# source "${IRONFOX_ENV_BUILD}"
+source "${IRONFOX_ENV_BUILD}"
 
 if [ "${IRONFOX_SIGN}" == 1 ]; then
     if [ "${IRONFOX_LOG_SIGN}" == 1 ]; then
@@ -46,10 +46,10 @@ if [ "${IRONFOX_SIGN}" == 1 ]; then
         # Ensure our log directory exists
         mkdir -vp "${IRONFOX_LOG_DIR}"
 
-        #if [ "${IRONFOX_CI}" == 1 ] && [ "${IRONFOX_TARGET_ARCH}" != 'bundle' ]; then
+        if [ "${IRONFOX_CI}" == 1 ] && [ "${IRONFOX_TARGET_ARCH}" != 'bundle' ]; then
             # CI should only try to sign bundle builds (which create/include all APKs)
-            #exit 0
-        #fi
+            exit 0
+        fi
 
         bash -x "${IRONFOX_SCRIPTS}/sign.sh" > >(tee -a "${SIGN_LOG_FILE}") 2>&1
     else

scripts/ci-build.sh

@@ -41,12 +41,10 @@ if ! [[ -s "${IRONFOX_KEYSTORE}"  ]]; then
 fi
 
 # Get sources
-# bash -x "${IRONFOX_SCRIPTS}/get_sources.sh"
-bash -x "${IRONFOX_SCRIPTS}/get_sources.sh" 'bundletool'
-bash -x "${IRONFOX_SCRIPTS}/get_sources.sh" 'jdk-17'
+bash -x "${IRONFOX_SCRIPTS}/get_sources.sh"
 
 # Prepare sources
-# bash -x "${IRONFOX_SCRIPTS}/prebuild.sh"
+bash -x "${IRONFOX_SCRIPTS}/prebuild.sh"
 
 # Build
 bash -x "${IRONFOX_SCRIPTS}/build.sh" "${BUILD_VARIANT}"

scripts/env_common.sh

@@ -108,7 +108,7 @@ export IRONFOX_OUTPUTS_FENIX_X86_64_SIGNED="${IRONFOX_OUTPUTS_APK}/ironfox-${IRO
 export IRONFOX_OUTPUTS_FENIX_X86_64_UNSIGNED="${IRONFOX_OUTPUTS_APK}/ironfox-${IRONFOX_CHANNEL}-x86_64-unsigned.apk"
 export IRONFOX_OUTPUTS_FENIX_UNIVERSAL_SIGNED="${IRONFOX_OUTPUTS_APK}/ironfox-${IRONFOX_CHANNEL}-universal-signed.apk"
 export IRONFOX_OUTPUTS_FENIX_UNIVERSAL_UNSIGNED="${IRONFOX_OUTPUTS_APK}/ironfox-${IRONFOX_CHANNEL}-universal-unsigned.apk"
-export IRONFOX_OUTPUTS_FENIX_AAB="${IRONFOX_ROOT}/test/ironfox-nightly.aab"
+export IRONFOX_OUTPUTS_FENIX_AAB="${IRONFOX_OUTPUTS_AAB}/ironfox-${IRONFOX_CHANNEL}.aab"
 export IRONFOX_OUTPUTS_FENIX_APKS="${IRONFOX_OUTPUTS_APKS}/ironfox-${IRONFOX_CHANNEL}.apks"
 
 # Should we create a log file for build.sh? (Default)

scripts/sign.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 # Set-up our environment
 bash -x $(dirname $0)/env.sh
 source $(dirname $0)/env.sh
-# source "${IRONFOX_ENV_BUILD}"
+source "${IRONFOX_ENV_BUILD}"
 
 # Include version info
 source "${IRONFOX_VERSIONS}"
@@ -80,32 +80,32 @@ function sign_bundle() {
     echo_green_text 'SUCCESS: Created signed bundleset'
 }
 
-if true; then
+if [ "${IRONFOX_TARGET_ARCH}" == 'bundle' ]; then
     # Sign ARM64 APK
-    # sign_arm64
+    sign_arm64
 
     # Sign ARM APK
-    # sign_arm
+    sign_arm
 
     # Sign x86_64 APK
-    # sign_x86_64
+    sign_x86_64
 
     # Sign universal APK
-    # sign_universal
+    sign_universal
 
     # Build signed APK set
     sign_bundle
-#elif [ "${IRONFOX_TARGET_ARCH}" == 'arm64' ]; then
+elif [ "${IRONFOX_TARGET_ARCH}" == 'arm64' ]; then
     # Sign ARM64 APK
-#    sign_arm64
-#elif [ "${IRONFOX_TARGET_ARCH}" == 'arm' ]; then
+    sign_arm64
+elif [ "${IRONFOX_TARGET_ARCH}" == 'arm' ]; then
     # Sign ARM APK
-#    sign_arm
-#elif [ "${IRONFOX_TARGET_ARCH}" == 'x86_64' ]; then
+    sign_arm
+elif [ "${IRONFOX_TARGET_ARCH}" == 'x86_64' ]; then
     # Sign x86_64 APK
-#    sign_x86_64
+    sign_x86_64
 else
-    #echo_red_text "ERROR: Unknown target architecture: ${IRONFOX_TARGET_ARCH}"
+    echo_red_text "ERROR: Unknown target architecture: ${IRONFOX_TARGET_ARCH}"
     exit 1
 fi
 

test/ironfox-nightly.aab

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0acb7c34247d6717a72f19281005e55add9cb72cc0103a49b635e44da235bd6a
-size 318083317