update ci scripts

2024-12-22 11:39:22 +00:00 · 2024-12-12 09:18:43 -05:00 · 2024-12-12 09:18:43 -05:00 · 4918aeb984
commit 4918aeb984
parent 9750d2a9ec
12 changed files with 14 additions and 72 deletions
--- a/.github/workflows/pr_test_build_android.yml
+++ b/.github/workflows/pr_test_build_android.yml
@ -107,8 +107,8 @@ jobs:
        run: |
          cd /opt/android/cake_wallet/scripts/android/
          source ./app_env.sh cakewallet
-          ./build_monero_all.sh
-          rm -rf ../monero_c/{monero,wownero,zano}/contrib/depends
+          BUILD_ONLY_AARCH64=ON ./build_monero_all.sh
+          rm -rf ../monero_c/{monero,wownero,zano}/contrib/depends ../monero_c/contrib/depends

      - name: Install Flutter dependencies
        run: |
--- a/cw_monero/pubspec.lock
+++ b/cw_monero/pubspec.lock
@ -511,8 +511,8 @@ packages:
    dependency: "direct main"
    description:
      path: "impls/monero.dart"
-      ref: daaa49f9756f24b9b588c746a65851748e67eaf0
-      resolved-ref: daaa49f9756f24b9b588c746a65851748e67eaf0
+      ref: 4672390caf1c9cd58351ce1869f3ed656ae67720
+      resolved-ref: 4672390caf1c9cd58351ce1869f3ed656ae67720
      url: "https://github.com/mrcyjanek/monero_c"
    source: git
    version: "0.0.0"
--- a/cw_monero/pubspec.yaml
+++ b/cw_monero/pubspec.yaml
@ -25,7 +25,7 @@ dependencies:
  monero:
    git:
      url: https://github.com/mrcyjanek/monero_c
-      ref: daaa49f9756f24b9b588c746a65851748e67eaf0
+      ref: 4672390caf1c9cd58351ce1869f3ed656ae67720
      path: impls/monero.dart
  mutex: ^3.1.0
  ledger_flutter_plus: ^1.4.1
--- a/cw_wownero/pubspec.lock
+++ b/cw_wownero/pubspec.lock
@ -471,8 +471,8 @@ packages:
    dependency: "direct main"
    description:
      path: "impls/monero.dart"
-      ref: daaa49f9756f24b9b588c746a65851748e67eaf0
-      resolved-ref: daaa49f9756f24b9b588c746a65851748e67eaf0
+      ref: 4672390caf1c9cd58351ce1869f3ed656ae67720
+      resolved-ref: 4672390caf1c9cd58351ce1869f3ed656ae67720
      url: "https://github.com/mrcyjanek/monero_c"
    source: git
    version: "0.0.0"
--- a/cw_wownero/pubspec.yaml
+++ b/cw_wownero/pubspec.yaml
@ -25,7 +25,7 @@ dependencies:
  monero:
    git:
      url: https://github.com/mrcyjanek/monero_c
-      ref: daaa49f9756f24b9b588c746a65851748e67eaf0 # monero_c hash
+      ref: 4672390caf1c9cd58351ce1869f3ed656ae67720 # monero_c hash
      path: impls/monero.dart
  mutex: ^3.1.0

--- a/cw_zano/pubspec.lock
+++ b/cw_zano/pubspec.lock
@ -476,8 +476,8 @@ packages:
    dependency: "direct main"
    description:
      path: "impls/monero.dart"
-      ref: daaa49f9756f24b9b588c746a65851748e67eaf0
-      resolved-ref: daaa49f9756f24b9b588c746a65851748e67eaf0
+      ref: 4672390caf1c9cd58351ce1869f3ed656ae67720
+      resolved-ref: 4672390caf1c9cd58351ce1869f3ed656ae67720
      url: "https://github.com/mrcyjanek/monero_c"
    source: git
    version: "0.0.0"
--- a/cw_zano/pubspec.yaml
+++ b/cw_zano/pubspec.yaml
@ -26,7 +26,7 @@ dependencies:
  monero:
    git:
      url: https://github.com/mrcyjanek/monero_c
-      ref: daaa49f9756f24b9b588c746a65851748e67eaf0 # monero_c hash
+      ref: 4672390caf1c9cd58351ce1869f3ed656ae67720 # monero_c hash
      path: impls/monero.dart
 dev_dependencies:
  flutter_test:
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -3,38 +3,6 @@ PODS:
    - Flutter
    - ReachabilitySwift
  - CryptoSwift (1.8.3)
-  - cw_haven (0.0.1):
-    - cw_haven/Boost (= 0.0.1)
-    - cw_haven/Haven (= 0.0.1)
-    - cw_haven/OpenSSL (= 0.0.1)
-    - cw_haven/Sodium (= 0.0.1)
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Boost (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Haven (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/OpenSSL (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Sodium (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_mweb (0.0.1):
-    - Flutter
-  - cw_shared_external (0.0.1):
-    - cw_shared_external/Boost (= 0.0.1)
-    - cw_shared_external/OpenSSL (= 0.0.1)
-    - cw_shared_external/Sodium (= 0.0.1)
-    - Flutter
-  - cw_shared_external/Boost (0.0.1):
-    - Flutter
-  - cw_shared_external/OpenSSL (0.0.1):
-    - Flutter
-  - cw_shared_external/Sodium (0.0.1):
-    - Flutter
  - device_display_brightness (0.0.1):
    - Flutter
  - device_info_plus (0.0.1):
@ -117,8 +85,6 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - sp_scanner (0.0.1):
-    - Flutter
  - SwiftyGif (5.4.5)
  - Toast (4.1.1)
  - uni_links (0.0.1):
@ -136,9 +102,6 @@ PODS:
 DEPENDENCIES:
  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - CryptoSwift
-  - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
-  - cw_mweb (from `.symlinks/plugins/cw_mweb/ios`)
-  - cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
  - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
@ -158,7 +121,6 @@ DEPENDENCIES:
  - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sp_scanner (from `.symlinks/plugins/sp_scanner/ios`)
  - uni_links (from `.symlinks/plugins/uni_links/ios`)
  - universal_ble (from `.symlinks/plugins/universal_ble/darwin`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@ -179,12 +141,6 @@ SPEC REPOS:
 EXTERNAL SOURCES:
  connectivity_plus:
    :path: ".symlinks/plugins/connectivity_plus/ios"
-  cw_haven:
-    :path: ".symlinks/plugins/cw_haven/ios"
-  cw_mweb:
-    :path: ".symlinks/plugins/cw_mweb/ios"
-  cw_shared_external:
-    :path: ".symlinks/plugins/cw_shared_external/ios"
  device_display_brightness:
    :path: ".symlinks/plugins/device_display_brightness/ios"
  device_info_plus:
@ -223,8 +179,6 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/share_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sp_scanner:
-    :path: ".symlinks/plugins/sp_scanner/ios"
  uni_links:
    :path: ".symlinks/plugins/uni_links/ios"
  universal_ble:
@ -239,9 +193,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
  CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483
-  cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
-  cw_mweb: 87af74f9659fed0c1a2cbfb44413f1070e79e3ae
-  cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
  device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7
  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
  devicelocale: 35ba84dc7f45f527c3001535d8c8d104edd5d926
@ -266,7 +217,6 @@ SPEC CHECKSUMS:
  sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sp_scanner: eaa617fa827396b967116b7f1f43549ca62e9a12
  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
  Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
@ -277,4 +227,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: e448f662d4c41f0c0b1ccbb78afd57dbf895a597

-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@ -10,7 +10,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )

 list(APPEND FLUTTER_FFI_PLUGIN_LIST
-  sp_scanner
 )

 set(PLUGIN_BUNDLED_LIBRARIES)
--- a/scripts/android/build_monero_all.sh
+++ b/scripts/android/build_monero_all.sh
@ -18,7 +18,6 @@ fi
 if [[ ! "x$RUNNER_OS" == "x" ]];
 then
    REMOVE_CACHES=ON
-    BUILD_ONLY_AARCH64=ON
 fi

 # NOTE: -j1 is intentional. Otherwise you will run into weird behaviour on macos
@ -38,14 +37,8 @@ else
    do
        pushd ../monero_c
            [[ ! "x$BUILD_ONLY_AARCH64" == "x" ]] && ./build_single.sh ${COIN} x86_64-linux-android $NPROC
-            [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/x86_64-linux-android
-            # ./build_single.sh ${COIN} i686-linux-android $NPROC
-            # [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/i686-linux-android
            [[ ! "x$BUILD_ONLY_AARCH64" == "x" ]] && ./build_single.sh ${COIN} armv7a-linux-androideabi $NPROC
-            [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/armv7a-linux-androideabi
            ./build_single.sh ${COIN} aarch64-linux-android $NPROC
-            [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/aarch64-linux-android
-
        popd
        [[ ! "x$BUILD_ONLY_AARCH64" == "x" ]] && unxz -f ../monero_c/release/${COIN}/x86_64-linux-android_libwallet2_api_c.so.xz

@ -53,5 +46,6 @@ else

        unxz -f ../monero_c/release/${COIN}/aarch64-linux-android_libwallet2_api_c.so.xz
        [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf ${COIN}/contrib/depends/{built,sources}
+        [[ ! "x$REMOVE_CACHES" == "x" ]] && rm -rf contrib/depends/{built,sources}
    done
 fi
--- a/scripts/prepare_moneroc.sh
+++ b/scripts/prepare_moneroc.sh
@ -8,7 +8,7 @@ if [[ ! -d "monero_c" ]];
 then
    git clone https://github.com/mrcyjanek/monero_c --branch master
    cd monero_c
-    git checkout daaa49f9756f24b9b588c746a65851748e67eaf0
+    git checkout 4672390caf1c9cd58351ce1869f3ed656ae67720
    git reset --hard
    git submodule update --init --force --recursive
    ./apply_patches.sh monero
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@ -14,7 +14,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )

 list(APPEND FLUTTER_FFI_PLUGIN_LIST
-  sp_scanner
 )

 set(PLUGIN_BUNDLED_LIBRARIES)