diff --git a/.github/scripts/sign-apks.sh b/.github/scripts/sign-apks.sh index 9c475c363..57413ac1b 100755 --- a/.github/scripts/sign-apks.sh +++ b/.github/scripts/sign-apks.sh @@ -1,16 +1,18 @@ #!/bin/bash set -e +shopt -s globstar nullglob extglob TOOLS="$(ls -d ${ANDROID_HOME}/build-tools/* | tail -1)" -shopt -s globstar nullglob extglob APKS=( **/*".apk" ) # Fail if too little extensions seem to have been built if [ "${#APKS[@]}" -le "1" ]; then echo "Insufficient amount of APKs found. Please check the project configuration." - exit 1; -fi; + exit 1 +else + echo "Signing ${#APKS[@]} APKs" +fi # Take base64 encoded key input and put it into a file STORE_PATH=$PWD/signingkey.jks @@ -24,16 +26,18 @@ export KEY_PASSWORD=$4 DEST=$PWD/apk rm -rf $DEST && mkdir -p $DEST -MAX_PARALLEL=4 +MAX_PARALLEL=5 # Sign all of the APKs for APK in ${APKS[@]}; do ( + echo "Signing $APK" BASENAME=$(basename $APK) APKNAME="${BASENAME%%+(-release*)}.apk" APKDEST="$DEST/$APKNAME" - ${TOOLS}/zipalign -c -v -p 4 $APK + # AGP already zipaligns APKs + # ${TOOLS}/zipalign -c -v -p 4 $APK cp $APK $APKDEST ${TOOLS}/apksigner sign --ks $STORE_PATH --ks-key-alias $STORE_ALIAS --ks-pass env:KEY_STORE_PASSWORD --key-pass env:KEY_PASSWORD $APKDEST diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 4e9ef82b1..bc0a82fdc 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -21,12 +21,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - lang: [all, ar, ca, de, en, es, fr, id, it, ja, ko, pt, ru, th, tr, vi, zh] + lang: [all, en, ar, ca, de, es, fr, id, it, ja, ko, pt, ru, th, tr, vi, zh] steps: - name: Checkout PR uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK uses: actions/setup-java@v1 with: java-version: 1.8 @@ -64,12 +64,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - lang: [all, ar, ca, de, en, es, fr, id, it, ja, ko, pt, ru, th, tr, vi, zh] + lang: [all, en, ar, ca, de, es, fr, id, it, ja, ko, pt, ru, th, tr, vi, zh] steps: - name: Checkout PR uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK uses: actions/setup-java@v1 with: java-version: 1.8 diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 7097c1c87..223783df6 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -3,7 +3,7 @@ name: Lock threads on: # Daily schedule: - - cron: '0 * * * *' + - cron: '0 0 * * *' # Manual trigger workflow_dispatch: inputs: