From 99a3f365bacfff646bae70b9a5c7f7fbae95cf98 Mon Sep 17 00:00:00 2001 From: WindowsMEMZ Date: Sun, 15 Sep 2024 13:48:36 +0800 Subject: [PATCH] deploy: Update alternative distribution info --- DarockBili.xcodeproj/project.pbxproj | 16 ++++++++-------- ci_scripts/ci_post_xcodebuild.sh | 13 ++++--------- ci_scripts/ci_pre_xcodebuild.sh | 4 ++-- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/DarockBili.xcodeproj/project.pbxproj b/DarockBili.xcodeproj/project.pbxproj index 68a74cc8e..3a7de702f 100644 --- a/DarockBili.xcodeproj/project.pbxproj +++ b/DarockBili.xcodeproj/project.pbxproj @@ -1506,7 +1506,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1351; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\""; - DEVELOPMENT_TEAM = B38QUJMY47; + DEVELOPMENT_TEAM = MU2GGQV46U; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; @@ -1526,8 +1526,8 @@ "@executable_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.1.4; - PRODUCT_BUNDLE_IDENTIFIER = com.linecom.mwbilialt; + MARKETING_VERSION = 1.0.0; + PRODUCT_BUNDLE_IDENTIFIER = com.darock.alt785.DarockBili; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1550,21 +1550,21 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1351; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview\\ Content\""; - DEVELOPMENT_TEAM = B38QUJMY47; + DEVELOPMENT_TEAM = MU2GGQV46U; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ""; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "MeowBili-Watch-App-Info.plist"; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.linecom.mwbilialt; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.darock.alt785.DarockBili; INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = YES; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); MARKETING_VERSION = 1.1.4; - PRODUCT_BUNDLE_IDENTIFIER = com.linecom.mwbilialt.watchkitapp; + PRODUCT_BUNDLE_IDENTIFIER = com.darock.alt785.DarockBili.watchkitapp; PRODUCT_NAME = "喵哩喵哩"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -1608,7 +1608,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1351; - DEVELOPMENT_TEAM = B38QUJMY47; + DEVELOPMENT_TEAM = MU2GGQV46U; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SafariExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = SafariExtension; @@ -1624,7 +1624,7 @@ "-framework", SafariServices, ); - PRODUCT_BUNDLE_IDENTIFIER = com.linecom.mwbilialt.SafariExtension; + PRODUCT_BUNDLE_IDENTIFIER = com.darock.alt785.DarockBili.SafariExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; diff --git a/ci_scripts/ci_post_xcodebuild.sh b/ci_scripts/ci_post_xcodebuild.sh index 95ace6ca2..33cd6339c 100755 --- a/ci_scripts/ci_post_xcodebuild.sh +++ b/ci_scripts/ci_post_xcodebuild.sh @@ -1,16 +1,11 @@ #!/bin/bash -if [[ "$CI_WORKFLOW" == "Canary Deploy" ]]; then +if [[ "$CI_WORKFLOW" == "Public Release" ]]; then TESTFLIGHT_DIR_PATH=../TestFlight mkdir $TESTFLIGHT_DIR_PATH - echo -e "CI 自动生成信息,24小时内的main分支的提交:\n" > $TESTFLIGHT_DIR_PATH/WhatToTest.zh-Hans.txt - git fetch -a --deepen 40 && git log --since="24 hours ago" main --pretty=format:"%s" >> $TESTFLIGHT_DIR_PATH/WhatToTest.zh-Hans.txt -elif [[ "$CI_WORKFLOW" == "Public Release" ]]; then + echo -e "当前语义化版本:$CI_TAG\n\nRelease Notes: https://github.com/Darock-Studio/Darock-Bili/releases/tag/$CI_TAG\n\n若要使用 watchOS App,请打开“在 Apple Watch 上显示 App”开关" > $TESTFLIGHT_DIR_PATH/WhatToTest.zh-Hans.txt +elif [[ "$CI_WORKFLOW" == "Alternative" ]]; then TESTFLIGHT_DIR_PATH=../TestFlight mkdir $TESTFLIGHT_DIR_PATH - echo -e "当前语义化版本:$CI_TAG\n\nRelease Notes: https://github.com/Darock-Studio/Darock-Bili/releases/tag/$CI_TAG\n\n若要使用watchOS App,请打开“在Apple Watch上显示App”开关" > $TESTFLIGHT_DIR_PATH/WhatToTest.zh-Hans.txt -elif [[ "$CI_WORKFLOW" == "TF Deploy" ]]; then - TESTFLIGHT_DIR_PATH=../TestFlight - mkdir $TESTFLIGHT_DIR_PATH - echo -e "由 Linecom 替代分发的喵哩喵哩\n\n当前语义化版本:$CI_TAG\n\nRelease Notes: https://github.com/Darock-Studio/Darock-Bili/releases/tag/$CI_TAG\n\n若要使用watchOS App,请打开“在Apple Watch上显示App”开关" > $TESTFLIGHT_DIR_PATH/WhatToTest.zh-Hans.txt + echo -e "由 ThreeManager785 替代分发的喵哩喵哩\n\n当前语义化版本:$CI_TAG\n\nRelease Notes: https://github.com/Darock-Studio/Darock-Bili/releases/tag/$CI_TAG\n\n若要使用 watchOS App,请打开“在 Apple Watch 上显示 App”开关" > $TESTFLIGHT_DIR_PATH/WhatToTest.zh-Hans.txt fi diff --git a/ci_scripts/ci_pre_xcodebuild.sh b/ci_scripts/ci_pre_xcodebuild.sh index 9ae279299..ba8057688 100755 --- a/ci_scripts/ci_pre_xcodebuild.sh +++ b/ci_scripts/ci_pre_xcodebuild.sh @@ -2,8 +2,8 @@ if [ "$CI_WORKFLOW" = "Public Release" ]; then NEW_TEXT="Darock" -elif [ "$CI_WORKFLOW" = "TF Deploy" ]; then - NEW_TEXT="Linecom" +elif [ "$CI_WORKFLOW" = "Alternative" ]; then + NEW_TEXT="785" else # 默认值,如果 CI_WORKFLOW 不匹配上述条件 NEW_TEXT="Unknown"