Merge commit '8a089ba1' into xiezhaolin

galaxy/fastlane/Fastfile

@@ -11,19 +11,21 @@ platform :ios do
   adhoc_pgyer_api_key = "ba79f62a052072f2486ad29632fefd46"
   release_pgyer_api_key =  "ac973522a8c357596c3dd58d311d10d8"
 
-  before_all do
-     # 拉取最新代码
-     develop_branch = "develop"
-     sh "git checkout #{develop_branch}"
-     sh "git pull origin #{develop_branch}"
-     cocoapods(use_bundle_exec: false)
-
-  end
+  develop_branch = "develop"
+  main_branch = "main"
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 
     # add actions here: https://docs.fastlane.tools/actions
 
+    sh "git checkout #{develop_branch}"
+     # 拉取最新代码
+     sh "git pull origin #{develop_branch}"
+     # 显示git当前分支最新submit id
+     sh "git rev-parse HEAD"
+     # 更新pod第三方库
+     cocoapods(use_bundle_exec: true)
+
     gym(
     workspace: 'galaxy.xcworkspace',
     # 每次打包之前clean一下
@@ -71,6 +73,13 @@ platform :ios do
  lane :galaxyRelease do 
     # add actions here: https://docs.fastlane.tools/actions
 
+    sh "git checkout #{main_branch}"
+    # 拉取最新代码
+    sh "git pull origin #{main_branch}"
+    # 显示git当前分支最新submit id
+    sh "git rev-parse HEAD"
+    # 更新pod第三方库
+    cocoapods(use_bundle_exec: true)
   
     gym(
     workspace: 'galaxy.xcworkspace',