fix:调整ci
This commit is contained in:
parent
46bec40eb7
commit
804cdba152
@ -81,6 +81,7 @@ variables:
|
|||||||
- export NEXT_VERSION="$(cat app_new.version)"
|
- export NEXT_VERSION="$(cat app_new.version)"
|
||||||
- bash scripts/bundle_install_and_auto_add.sh android/Gemfile vendor/bundle_android "bundle exec fastlane -v"
|
- bash scripts/bundle_install_and_auto_add.sh android/Gemfile vendor/bundle_android "bundle exec fastlane -v"
|
||||||
- gem pristine --all || true # 修复所有未编译的gem扩展
|
- gem pristine --all || true # 修复所有未编译的gem扩展
|
||||||
|
- echo -e "---\n:backtrace: false\n:bulk_threshold: 1000\n:sources:\n- https://rubygems.org\n:update_sources: true\n:verbose: true" > ~/.gemrc
|
||||||
script:
|
script:
|
||||||
# 输出调试信息,便于后续排查环境问题
|
# 输出调试信息,便于后续排查环境问题
|
||||||
- echo "=== DEBUG INFO (android) ==="
|
- echo "=== DEBUG INFO (android) ==="
|
||||||
@ -115,6 +116,7 @@ variables:
|
|||||||
- export NEXT_VERSION="$(cat app_new.version)"
|
- export NEXT_VERSION="$(cat app_new.version)"
|
||||||
- bash scripts/bundle_install_and_auto_add.sh ios/Gemfile vendor/bundle_ios "bundle exec fastlane -v"
|
- bash scripts/bundle_install_and_auto_add.sh ios/Gemfile vendor/bundle_ios "bundle exec fastlane -v"
|
||||||
- gem pristine --all || true # 修复所有未编译的gem扩展
|
- gem pristine --all || true # 修复所有未编译的gem扩展
|
||||||
|
- echo -e "---\n:backtrace: false\n:bulk_threshold: 1000\n:sources:\n- https://rubygems.org\n:update_sources: true\n:verbose: true" > ~/.gemrc
|
||||||
script:
|
script:
|
||||||
# 输出调试信息,便于后续排查环境问题
|
# 输出调试信息,便于后续排查环境问题
|
||||||
- echo "=== DEBUG INFO (ios) ==="
|
- echo "=== DEBUG INFO (ios) ==="
|
||||||
|
|||||||
@ -46,36 +46,15 @@ if [ $success -eq 1 ]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 2. 统一执行镜像切换和重试的bundle install
|
# 2. 只用 rubygems.org 官方源进行 bundle install
|
||||||
try_count=0
|
bundle config mirror.https://rubygems.org https://rubygems.org
|
||||||
max_try=3
|
bundle config set --local path "$BUNDLE_PATH"
|
||||||
success=0
|
bundle install --gemfile "$GEMFILE_PATH"
|
||||||
bundle config mirror.https://rubygems.org https://mirrors.aliyun.com/rubygems/
|
if [ $? -eq 0 ]; then
|
||||||
while [ $try_count -lt $max_try ]; do
|
echo "[SUCCESS] 官方源 bundle install 成功"
|
||||||
echo "[INFO] 第$((try_count+1))次尝试使用阿里云镜像 bundle install..."
|
else
|
||||||
bundle config set --local path "$BUNDLE_PATH"
|
echo "[FATAL] 官方源 bundle install 失败,请检查网络或Gemfile配置。"
|
||||||
bundle install --gemfile "$GEMFILE_PATH"
|
exit 2
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
echo "[SUCCESS] 使用阿里云镜像 bundle install 成功"
|
|
||||||
success=1
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
try_count=$((try_count+1))
|
|
||||||
sleep 2
|
|
||||||
echo "[WARN] 阿里云镜像 bundle install 第$try_count 次失败,准备重试..."
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ $success -eq 0 ]; then
|
|
||||||
echo "[ERROR] 阿里云镜像 bundle install 失败$max_try次,切换为官方源重试..."
|
|
||||||
bundle config mirror.https://rubygems.org https://rubygems.org
|
|
||||||
bundle config set --local path "$BUNDLE_PATH"
|
|
||||||
bundle install --gemfile "$GEMFILE_PATH"
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
echo "[SUCCESS] 官方源 bundle install 成功"
|
|
||||||
else
|
|
||||||
echo "[FATAL] 官方源 bundle install 依然失败,请检查网络或Gemfile配置。"
|
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 3. 最后再执行一次主命令校验
|
# 3. 最后再执行一次主命令校验
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user