[CI]: Try to use api-30 x86

trustwallet · Oct 25, 2023 · c5b22a3 · c5b22a3
1 parent 8634118
commit c5b22a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
@@ -69,9 +69,9 @@ jobs:
     - name: Run tests
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 33
+        api-level: 30
         target: google_apis
-        arch: x86_64
+        arch: x86
         ndk: 23.1.7779620
         cmake: 3.18.1
         script: cd android; ./gradlew connectedAndroidTest

diff --git a/tools/install-android-dependencies b/tools/install-android-dependencies
@@ -21,7 +21,7 @@ https://repo1.maven.org/maven2/org/freemarker/freemarker/2.3.31/freemarker-2.3.3
 )
 
 $ANDROID_CMDTOOLS/sdkmanager --verbose "cmake;3.18.1" "ndk;23.1.7779620"
-$ANDROID_CMDTOOLS/sdkmanager "system-images;android-33;google_apis;x86_64"
+$ANDROID_CMDTOOLS/sdkmanager "system-images;android-30;google_apis;x86"
 
 echo -e "y\ny\ny\ny\ny\n" | $ANDROID_CMDTOOLS/sdkmanager --licenses
 

diff --git a/tools/install-dependencies b/tools/install-dependencies
@@ -99,13 +99,13 @@ function build_boost_for_android() {
     mkdir -p "$BOOST_TEMP_DIR"
 
     pushd $BOOST_DIR
-    ./build-android.sh --prefix=$BOOST_TEMP_DIR --without-libraries=program_options,thread,atomic,chrono,filesystem,iostreams,json,log,python,random,regex,test,timer --arch=x86_64 $NDK_PATH
+    ./build-android.sh --prefix=$BOOST_TEMP_DIR --without-libraries=program_options,thread,atomic,chrono,filesystem,iostreams,json,log,python,random,regex,test,timer --arch=x86 $NDK_PATH
     popd
 
     mkdir -p "$PREFIX/include"
     mkdir -p "$PREFIX/lib"
-    mv "$BOOST_TEMP_DIR/x86_64/include/boost-1_82/boost" "$PREFIX/include"
-    cp -r "$BOOST_TEMP_DIR/x86_64/lib/" "$PREFIX/lib"
+    mv "$BOOST_TEMP_DIR/x86/include/boost-1_82/boost" "$PREFIX/include"
+    cp -r "$BOOST_TEMP_DIR/x86/lib/" "$PREFIX/lib"
 }
 
 download_dependencies $1