update workflow

Elite-Labs · Mar 27, 2024 · 71de89c · 71de89c
1 parent 83b8ae4
commit 71de89c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ios_build.yml b/.github/workflows/ios_build.yml
@@ -16,7 +16,6 @@ jobs:
           KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
         run: |
           # create variables
-          echo ${{ secrets.TEST }}
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
           KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
@@ -33,7 +33,7 @@ git config --global protocol.file.allow always
 
 git submodule update --init --force
 
-if [[ ! " $@ " =~ " --skip_main_deps " ]]; then
+if [[ " $@ " =~ " --skip_main_deps " ]]; then
     exit 0
 fi
 

diff --git a/scripts/ios/app_config.sh b/scripts/ios/app_config.sh
@@ -42,9 +42,9 @@ case $APP_IOS_TYPE in
 esac
 
 cp -rf pubspec_description.yaml pubspec.yaml
-flutter pub get
-flutter pub run tool/generate_pubspec.dart
-flutter pub get
-flutter packages pub run tool/configure.dart $CONFIG_ARGS
+.flutter/bin/flutter pub get
+.flutter/bin/flutter pub run tool/generate_pubspec.dart
+.flutter/bin/flutter pub get
+.flutter/bin/flutter packages pub run tool/configure.dart $CONFIG_ARGS
 cd $DIR
 $DIR/app_icon.sh
diff --git a/scripts/ios/build_monero.sh b/scripts/ios/build_monero.sh
@@ -12,6 +12,8 @@ cd $MONERO_DIR_PATH
 git submodule update --init --force
 git checkout .
 git clean -fdx
+git revert eff4dc2be6d8bd1cb565141bbfce66e2bf697a4c --no-edit
+git reset HEAD~1
 
 mkdir -p build
 cd ..

diff --git a/scripts/ios/config.sh b/scripts/ios/config.sh
@@ -11,7 +11,7 @@ export ELITEWALLET_DATA_DIR=${EXTERNAL_IOS_SOURCE_DIR}/elite_wallet_data
 export LOCAL_GIT_DEPS=${ELITEWALLET_DATA_DIR}/deps
 export BUILD_TYPE="release"
 export LOCAL_GIT_DEPS_SUBDIR=${LOCAL_GIT_DEPS}/${BUILD_TYPE}
-export LAST_DEPS_CHANGE_GITHASH=$(find "$IOS_SCRIPTS_DIR" -type f -exec sha256sum {} + | sha256sum | cut -c1-6)
+export LAST_DEPS_CHANGE_GITHASH=$(find "$IOS_SCRIPTS_DIR" -type f -exec shasum -a 256 {} + | shasum -a 256 | cut -c1-6)
 export CURRENT_DEPS=${LOCAL_GIT_DEPS_SUBDIR}/${LAST_DEPS_CHANGE_GITHASH}
 
 mkdir -p $EXTERNAL_IOS_LIB_DIR