From 2c4ccb97fa4ef7d9a03cc7dbc3fa7f31ea4dbb10 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 2 Apr 2025 11:34:25 +0800 Subject: [PATCH 01/32] Output project --- .github/ci/build/build_ios.sh | 8 ++++++ iOS/APIExample/cloud_project.sh | 46 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100755 iOS/APIExample/cloud_project.sh diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 619315616..3a2046008 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -103,5 +103,13 @@ if [ $compile_project = true ]; then cd ./$unzip_name/samples/${ios_direction} ./cloud_build.sh || exit 1 cd - +else if [ $generate_project = true ]; then + cd ./$unzip_name/samples/${ios_direction} + ./cloud_project.sh || exit 1 + cd - fi +7za a -tzip APIExamples.zip ${ios_direction} +echo "start move project to workspace" +mv APIExamples.zip $WORKSPACE/${ios_direction}_${BUILD_NUMBER}.zip + diff --git a/iOS/APIExample/cloud_project.sh b/iOS/APIExample/cloud_project.sh new file mode 100755 index 000000000..0a23a5371 --- /dev/null +++ b/iOS/APIExample/cloud_project.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env sh + +PROJECT_PATH=$PWD + +if [ "$WORKSPACE" = "" ]; then + WORKSPACE=$PWD +fi +if [ "$BUILD_NUMBER" = "" ]; then + BUILD_NUMBER=888 +fi + + +cd ${PROJECT_PATH} + +#下载美颜资源 +echo "start download bytedance resource : $bytedance_lib" +curl -L -O "$bytedance_lib" +unzip -o vender_bytedance_iOS.zip +rm -f vender_bytedance_iOS.zip + +echo "start download sense resource : $sense_lib" +curl -L -O "$sense_lib" +unzip -o vender_sense_iOS.zip +rm -f vender_sense_iOS.zip + +echo "start download fu resource : $fu_lib" +curl -L -O "$fu_lib" +unzip -o vender_fu_iOS.zip +rm -f vender_fu_iOS.zip + +#打开第三方播放器配置 +sed -i -e "s#\# pod 'ijkplayer'# pod 'ijkplayer'#g" Podfile + +#打开第三方美颜 +sed -i -e "s#\# pod 'SenseLib'# pod 'SenseLib'#g" Podfile +sed -i -e "s#\# pod 'bytedEffect'# pod 'bytedEffect'#g" Podfile +sed -i -e "s#\# pod 'fuLib'# pod 'fuLib'#g" Podfile + +echo "work space: $WORKSPACE" +echo "project path: $PROJECT_PATH" + + +pod install --repo-update || exit 1 + + + From be101d5d9397bf47884f7240140d8f6a5429d665 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 2 Apr 2025 11:42:31 +0800 Subject: [PATCH 02/32] Modify the script --- .github/ci/build/build_ios.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 3a2046008..daeee9615 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -91,7 +91,7 @@ else mv ./$unzip_name/samples/${ios_direction}/sdk.podspec ./$unzip_name/ || exit 1 fi -python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 +# python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 echo "start compress" 7za a -tzip result.zip -r $unzip_name > log.txt From 4b93cb5d4e9b21489779984cefa39ead62c40904 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 2 Apr 2025 11:44:04 +0800 Subject: [PATCH 03/32] Add a test version --- iOS/APIExample/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/APIExample/Podfile b/iOS/APIExample/Podfile index cf913424b..1c44e5a01 100644 --- a/iOS/APIExample/Podfile +++ b/iOS/APIExample/Podfile @@ -4,7 +4,7 @@ #source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' def common_pods - pod 'AgoraRtcEngine_iOS', '4.5.2' + pod 'AgoraRtcEngine_iOS', '4.5.1' #pod 'sdk', :path => 'sdk.podspec' end From 2025e7c971fad4233f35eb5845fae33e7f8a3fe1 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 2 Apr 2025 11:53:08 +0800 Subject: [PATCH 04/32] add log --- .github/ci/build/build_ios.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index daeee9615..424a354c9 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -109,7 +109,7 @@ else if [ $generate_project = true ]; then cd - fi -7za a -tzip APIExamples.zip ${ios_direction} +7za a -tzip APIExamples.zip -r ${ios_direction} > log.txt echo "start move project to workspace" mv APIExamples.zip $WORKSPACE/${ios_direction}_${BUILD_NUMBER}.zip From 4a548159569aafd5ea95792b6299758776ceab81 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 2 Apr 2025 11:59:10 +0800 Subject: [PATCH 05/32] Grammatical errors --- .github/ci/build/build_ios.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 424a354c9..80122d417 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -91,7 +91,7 @@ else mv ./$unzip_name/samples/${ios_direction}/sdk.podspec ./$unzip_name/ || exit 1 fi -# python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 +python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 echo "start compress" 7za a -tzip result.zip -r $unzip_name > log.txt @@ -100,10 +100,10 @@ echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name if [ $compile_project = true ]; then - cd ./$unzip_name/samples/${ios_direction} - ./cloud_build.sh || exit 1 - cd - -else if [ $generate_project = true ]; then + cd ./$unzip_name/samples/${ios_direction} + ./cloud_build.sh || exit 1 + cd - +elif [ $generate_project = true ]; then cd ./$unzip_name/samples/${ios_direction} ./cloud_project.sh || exit 1 cd - From ef960189567512cc4ce3915d352c353578d86353 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 2 Apr 2025 14:10:52 +0800 Subject: [PATCH 06/32] add log --- .github/ci/build/build_ios.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 80122d417..38c61138e 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -109,7 +109,8 @@ elif [ $generate_project = true ]; then cd - fi -7za a -tzip APIExamples.zip -r ${ios_direction} > log.txt -echo "start move project to workspace" -mv APIExamples.zip $WORKSPACE/${ios_direction}_${BUILD_NUMBER}.zip +echo "ios_direction is : $ios_direction" +# 7za a -tzip APIExamples.zip -r ${ios_direction} > log.txt +# echo "start move project to workspace" +# mv APIExamples.zip $WORKSPACE/${ios_direction}_${BUILD_NUMBER}.zip From 26fcab307a6799c0597e3cb5434911c7ab48422d Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 2 Apr 2025 14:36:50 +0800 Subject: [PATCH 07/32] test ci --- .github/ci/build/build_ios.sh | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 38c61138e..dba716253 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -100,17 +100,7 @@ echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name if [ $compile_project = true ]; then - cd ./$unzip_name/samples/${ios_direction} - ./cloud_build.sh || exit 1 - cd - -elif [ $generate_project = true ]; then - cd ./$unzip_name/samples/${ios_direction} - ./cloud_project.sh || exit 1 - cd - -fi - -echo "ios_direction is : $ios_direction" -# 7za a -tzip APIExamples.zip -r ${ios_direction} > log.txt -# echo "start move project to workspace" -# mv APIExamples.zip $WORKSPACE/${ios_direction}_${BUILD_NUMBER}.zip - + cd ./$unzip_name/samples/${ios_direction} + ./cloud_build.sh || exit 1 + cd - +fi \ No newline at end of file From e4f1d2c573c66fe1d2f144c405224dc65958f509 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 2 Apr 2025 15:36:24 +0800 Subject: [PATCH 08/32] test ci --- .github/ci/build/build_ios.sh | 7 +++++++ iOS/APIExample/cloud_project.sh | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index dba716253..9a7ffc76b 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -99,6 +99,13 @@ echo "start move to" echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name +if [ $generate_project = true ]; then + echo "start generate project" + cd ./$unzip_name/samples/${ios_direction} + ./cloud_project.sh || exit 1 + cd - +fi + if [ $compile_project = true ]; then cd ./$unzip_name/samples/${ios_direction} ./cloud_build.sh || exit 1 diff --git a/iOS/APIExample/cloud_project.sh b/iOS/APIExample/cloud_project.sh index 0a23a5371..3bc229344 100755 --- a/iOS/APIExample/cloud_project.sh +++ b/iOS/APIExample/cloud_project.sh @@ -42,5 +42,16 @@ echo "project path: $PROJECT_PATH" pod install --repo-update || exit 1 +#工程文件路径 +APP_PATH="$(ls | grep xcworkspace)" +# 项目target名 +TARGET_NAME=${APP_PATH%%.*} +7za a -tzip ${TARGET_NAME}.zip -r ./* > log.txt + +echo "pwd path: $PWD" +ls -al +echo "target name: $TARGET_NAME" +OUTPUT_FILE=${WORKSPACE}/${TARGET_NAME}_$(date "+%Y%m%d%H%M%S").zip +mv ${TARGET_NAME}.zip $OUTPUT_FILE \ No newline at end of file From ffd21e60db312289c7476626cd8a89567da4e469 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 23 Apr 2025 16:11:38 +0800 Subject: [PATCH 09/32] modify node label --- .github/ci/build/build_ios.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ci/build/build_ios.groovy b/.github/ci/build/build_ios.groovy index b5bb5f63f..2a772435e 100644 --- a/.github/ci/build/build_ios.groovy +++ b/.github/ci/build/build_ios.groovy @@ -56,4 +56,4 @@ def doPublish(buildVariables) { sh "rm -rf *.zip *.ipa || true" } -pipelineLoad(this, "ApiExample", "build", "ios", "apiexample_mac") \ No newline at end of file +pipelineLoad(this, "ApiExample", "build", "ios", "RTC-Sample") \ No newline at end of file From 1c916f9ae43773eb73ec69dcbf1f3240fb1a6208 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 23 Apr 2025 16:34:58 +0800 Subject: [PATCH 10/32] modify script --- iOS/APIExample/cloud_build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iOS/APIExample/cloud_build.sh b/iOS/APIExample/cloud_build.sh index 876662738..7c14474a9 100755 --- a/iOS/APIExample/cloud_build.sh +++ b/iOS/APIExample/cloud_build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env sh +export LANG=en_US.UTF-8 +export PATH=$PATH:/opt/homebrew/bin PROJECT_PATH=$PWD From dab5271b203c1dc47ea90c50880633eb823440de Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 23 Apr 2025 16:51:32 +0800 Subject: [PATCH 11/32] export env --- .github/ci/build/build_ios.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 619315616..35402c179 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -38,6 +38,8 @@ # pr: output test.zip to workspace dir # others: Rename the zip package name yourself, But need copy it to workspace dir ################################## +export PATH=$PATH:/opt/homebrew/bin + xcode_version=$(xcodebuild -version | grep Xcode | awk '{print $2}') echo "Xcode Version: $xcode_version" echo ios_direction: $ios_direction From 71e7be14865f2c17ee26ef9e32c93601320382e5 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 23 Apr 2025 17:05:50 +0800 Subject: [PATCH 12/32] Modify ci script --- iOS/APIExample-Audio/cloud_build.sh | 2 ++ iOS/APIExample-OC/cloud_build.sh | 2 ++ iOS/APIExample-SwiftUI/cloud_build.sh | 2 ++ macOS/cloud_build.sh | 2 ++ 4 files changed, 8 insertions(+) diff --git a/iOS/APIExample-Audio/cloud_build.sh b/iOS/APIExample-Audio/cloud_build.sh index 891825139..d0eb9c347 100755 --- a/iOS/APIExample-Audio/cloud_build.sh +++ b/iOS/APIExample-Audio/cloud_build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env sh +export LANG=en_US.UTF-8 +export PATH=$PATH:/opt/homebrew/bin PROJECT_PATH=$PWD diff --git a/iOS/APIExample-OC/cloud_build.sh b/iOS/APIExample-OC/cloud_build.sh index 6f034dcbd..9949106d3 100755 --- a/iOS/APIExample-OC/cloud_build.sh +++ b/iOS/APIExample-OC/cloud_build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env sh +export LANG=en_US.UTF-8 +export PATH=$PATH:/opt/homebrew/bin PROJECT_PATH=$PWD diff --git a/iOS/APIExample-SwiftUI/cloud_build.sh b/iOS/APIExample-SwiftUI/cloud_build.sh index 09e1db451..e1eacbc4e 100755 --- a/iOS/APIExample-SwiftUI/cloud_build.sh +++ b/iOS/APIExample-SwiftUI/cloud_build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env sh +export LANG=en_US.UTF-8 +export PATH=$PATH:/opt/homebrew/bin PROJECT_PATH=$PWD diff --git a/macOS/cloud_build.sh b/macOS/cloud_build.sh index c2dc367b3..556a8fc25 100755 --- a/macOS/cloud_build.sh +++ b/macOS/cloud_build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env sh +export LANG=en_US.UTF-8 +export PATH=$PATH:/opt/homebrew/bin PROJECT_PATH=$PWD From da9af3ece5901de8089eb2da76dc11eb3aa25bb0 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Wed, 23 Apr 2025 17:22:02 +0800 Subject: [PATCH 13/32] Modify mac ci script --- .github/ci/build/build_mac.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ci/build/build_mac.groovy b/.github/ci/build/build_mac.groovy index 7760a16f8..93923911b 100644 --- a/.github/ci/build/build_mac.groovy +++ b/.github/ci/build/build_mac.groovy @@ -50,4 +50,4 @@ def doPublish(buildVariables) { sh "rm -rf *.zip || true" } -pipelineLoad(this, "ApiExample", "build", "mac", "apiexample_mac") \ No newline at end of file +pipelineLoad(this, "ApiExample", "build", "mac", "RTC-Sample") \ No newline at end of file From e8ea844176801478538e90240e71b00567db575b Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 11:29:36 +0800 Subject: [PATCH 14/32] Compress APIExample --- .github/ci/build/build_ios.sh | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index b2445ab9b..12fdf4926 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -63,6 +63,12 @@ export LANG=en_US.UTF-8 unzip_name=Agora_Native_SDK_for_iOS_FULL zip_name=output.zip sdk_url_flag=false +apiexample_cn_name=Shengwang_Native_SDK_for_iOS +apiexample_global_name=Agora_Native_SDK_for_iOS +cn_dir=CN +global_dir=Global + + if [ -z "$sdk_url" ]; then sdk_url_flag=false echo "sdk_url is empty" @@ -93,6 +99,7 @@ else mv ./$unzip_name/samples/${ios_direction}/sdk.podspec ./$unzip_name/ || exit 1 fi + python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 echo "start compress" @@ -101,15 +108,27 @@ echo "start move to" echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name -if [ $generate_project = true ]; then - echo "start generate project" - cd ./$unzip_name/samples/${ios_direction} +if [ $compile_sdk_project = true ]; then + sdk_version=$(grep "pod 'AgoraRtcEngine_iOS'" ./iOS/${ios_direction}/Podfile | sed -n "s/.*'\([0-9.]*\)'.*/\1/p") + echo "sdk_version: $sdk_version" + + mkdir -p $cn_dir $global_dir + cp -rf ./iOS/${ios_direction} $cn_dir/ + cp -rf ./iOS/${ios_direction} $global_dir/ + cd $cn_dir/${ios_direction} ./cloud_project.sh || exit 1 cd - -fi + echo "start compress api example" + 7za a -tzip cn_result.zip $cn_dir > log.txt + 7za a -tzip global_result.zip $global_dir > log.txt + + mv cn_result.zip $WORKSPACE/${apiexample_cn_name}_${sdk_version}_APIExample.zip + mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip +fi if [ $compile_project = true ]; then cd ./$unzip_name/samples/${ios_direction} ./cloud_build.sh || exit 1 cd - -fi \ No newline at end of file +fi + From 988f5b60fa944eaa9c883701fc259f91648e7681 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 11:31:21 +0800 Subject: [PATCH 15/32] Rename the variable name --- .github/ci/build/build_ios.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 12fdf4926..545cfea7e 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -108,7 +108,7 @@ echo "start move to" echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name -if [ $compile_sdk_project = true ]; then +if [ $compress_apiexample = true ]; then sdk_version=$(grep "pod 'AgoraRtcEngine_iOS'" ./iOS/${ios_direction}/Podfile | sed -n "s/.*'\([0-9.]*\)'.*/\1/p") echo "sdk_version: $sdk_version" From 947b1c174f657077f5ea8d0053c2e962d96b9a34 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 12:06:52 +0800 Subject: [PATCH 16/32] Modify script --- .github/ci/build/build_ios.sh | 1 - .github/ci/build/build_mac.sh | 24 ++++++++++++++++++++++++ iOS/APIExample-Audio/cloud_project.sh | 14 ++++++++++++++ iOS/APIExample-OC/cloud_project.sh | 14 ++++++++++++++ iOS/APIExample-SwiftUI/cloud_project.sh | 14 ++++++++++++++ iOS/APIExample/cloud_project.sh | 15 --------------- macOS/cloud_project.sh | 14 ++++++++++++++ 7 files changed, 80 insertions(+), 16 deletions(-) create mode 100755 iOS/APIExample-Audio/cloud_project.sh create mode 100755 iOS/APIExample-OC/cloud_project.sh create mode 100755 iOS/APIExample-SwiftUI/cloud_project.sh create mode 100755 macOS/cloud_project.sh diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 545cfea7e..ca3024b2e 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -99,7 +99,6 @@ else mv ./$unzip_name/samples/${ios_direction}/sdk.podspec ./$unzip_name/ || exit 1 fi - python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 echo "start compress" diff --git a/.github/ci/build/build_mac.sh b/.github/ci/build/build_mac.sh index 5c48c25f3..53be5bc3f 100644 --- a/.github/ci/build/build_mac.sh +++ b/.github/ci/build/build_mac.sh @@ -59,6 +59,10 @@ export LANG=en_US.UTF-8 unzip_name=Agora_Native_SDK_for_iOS_FULL zip_name=output.zip sdk_url_flag=false +apiexample_cn_name=Shengwang_Native_SDK_for_Mac +apiexample_global_name=Agora_Native_SDK_for_Mac +cn_dir=CN +global_dir=Global echo zip_name: $zip_name if [ -z "$sdk_url" ]; then @@ -92,9 +96,29 @@ else fi python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/APIExample/Podfile $sdk_url_flag + +echo "start compress" 7za a -tzip result.zip -r $unzip_name cp result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name +if [ $compress_apiexample = true ]; then + sdk_version=$(grep "pod 'AgoraRtcEngine_iOS'" ./iOS/${ios_direction}/Podfile | sed -n "s/.*'\([0-9.]*\)'.*/\1/p") + echo "sdk_version: $sdk_version" + + mkdir -p $cn_dir $global_dir + cp -rf ./iOS/${ios_direction} $cn_dir/ + cp -rf ./iOS/${ios_direction} $global_dir/ + cd $cn_dir/${ios_direction} + ./cloud_project.sh || exit 1 + cd - + echo "start compress api example" + 7za a -tzip cn_result.zip $cn_dir > log.txt + 7za a -tzip global_result.zip $global_dir > log.txt + + mv cn_result.zip $WORKSPACE/${apiexample_cn_name}_${sdk_version}_APIExample.zip + mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip +fi + if [ $compile_project = true ]; then cd ./$unzip_name/samples/APIExample ./cloud_build.sh || exit 1 diff --git a/iOS/APIExample-Audio/cloud_project.sh b/iOS/APIExample-Audio/cloud_project.sh new file mode 100755 index 000000000..d29b833f7 --- /dev/null +++ b/iOS/APIExample-Audio/cloud_project.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh + +PROJECT_PATH=$PWD + +if [ "$WORKSPACE" = "" ]; then + WORKSPACE=$PWD +fi +if [ "$BUILD_NUMBER" = "" ]; then + BUILD_NUMBER=888 +fi + + +cd ${PROJECT_PATH} && pod install || exit 1 + diff --git a/iOS/APIExample-OC/cloud_project.sh b/iOS/APIExample-OC/cloud_project.sh new file mode 100755 index 000000000..d29b833f7 --- /dev/null +++ b/iOS/APIExample-OC/cloud_project.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh + +PROJECT_PATH=$PWD + +if [ "$WORKSPACE" = "" ]; then + WORKSPACE=$PWD +fi +if [ "$BUILD_NUMBER" = "" ]; then + BUILD_NUMBER=888 +fi + + +cd ${PROJECT_PATH} && pod install || exit 1 + diff --git a/iOS/APIExample-SwiftUI/cloud_project.sh b/iOS/APIExample-SwiftUI/cloud_project.sh new file mode 100755 index 000000000..d29b833f7 --- /dev/null +++ b/iOS/APIExample-SwiftUI/cloud_project.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh + +PROJECT_PATH=$PWD + +if [ "$WORKSPACE" = "" ]; then + WORKSPACE=$PWD +fi +if [ "$BUILD_NUMBER" = "" ]; then + BUILD_NUMBER=888 +fi + + +cd ${PROJECT_PATH} && pod install || exit 1 + diff --git a/iOS/APIExample/cloud_project.sh b/iOS/APIExample/cloud_project.sh index 3bc229344..043cdec29 100755 --- a/iOS/APIExample/cloud_project.sh +++ b/iOS/APIExample/cloud_project.sh @@ -39,19 +39,4 @@ sed -i -e "s#\# pod 'fuLib'# pod 'fuLib'#g" Podfile echo "work space: $WORKSPACE" echo "project path: $PROJECT_PATH" - pod install --repo-update || exit 1 - -#工程文件路径 -APP_PATH="$(ls | grep xcworkspace)" - -# 项目target名 -TARGET_NAME=${APP_PATH%%.*} - -7za a -tzip ${TARGET_NAME}.zip -r ./* > log.txt - -echo "pwd path: $PWD" -ls -al -echo "target name: $TARGET_NAME" -OUTPUT_FILE=${WORKSPACE}/${TARGET_NAME}_$(date "+%Y%m%d%H%M%S").zip -mv ${TARGET_NAME}.zip $OUTPUT_FILE \ No newline at end of file diff --git a/macOS/cloud_project.sh b/macOS/cloud_project.sh new file mode 100755 index 000000000..d29b833f7 --- /dev/null +++ b/macOS/cloud_project.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh + +PROJECT_PATH=$PWD + +if [ "$WORKSPACE" = "" ]; then + WORKSPACE=$PWD +fi +if [ "$BUILD_NUMBER" = "" ]; then + BUILD_NUMBER=888 +fi + + +cd ${PROJECT_PATH} && pod install || exit 1 + From e08dc9385e05feba2a7c03081ab841f4f6f04b80 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 15:06:17 +0800 Subject: [PATCH 17/32] test ci --- iOS/APIExample/cloud_project.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/iOS/APIExample/cloud_project.sh b/iOS/APIExample/cloud_project.sh index 043cdec29..6580342d3 100755 --- a/iOS/APIExample/cloud_project.sh +++ b/iOS/APIExample/cloud_project.sh @@ -9,9 +9,6 @@ if [ "$BUILD_NUMBER" = "" ]; then BUILD_NUMBER=888 fi - -cd ${PROJECT_PATH} - #下载美颜资源 echo "start download bytedance resource : $bytedance_lib" curl -L -O "$bytedance_lib" @@ -40,3 +37,17 @@ echo "work space: $WORKSPACE" echo "project path: $PROJECT_PATH" pod install --repo-update || exit 1 + +#工程文件路径 +APP_PATH="$(ls | grep xcworkspace)" + +# 项目target名 +TARGET_NAME=${APP_PATH%%.*} + +7za a -tzip ${TARGET_NAME}.zip -r ./* > log.txt + +echo "pwd path: $PWD" +ls -al +echo "target name: $TARGET_NAME" +OUTPUT_FILE=${WORKSPACE}/${TARGET_NAME}_$(date "+%Y%m%d%H%M%S").zip +mv ${TARGET_NAME}.zip $OUTPUT_FILE From 864d38d4a9f7bc79c6e4c0bc1c44ea4074b22871 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 15:18:28 +0800 Subject: [PATCH 18/32] Delete the code which is not necessary --- .github/ci/build/build_ios.sh | 6 ++++-- iOS/APIExample/cloud_project.sh | 16 ---------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index ca3024b2e..b99247d10 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -118,11 +118,13 @@ if [ $compress_apiexample = true ]; then ./cloud_project.sh || exit 1 cd - echo "start compress api example" - 7za a -tzip cn_result.zip $cn_dir > log.txt - 7za a -tzip global_result.zip $global_dir > log.txt + 7za a -tzip cn_result.zip $cn_dir + 7za a -tzip global_result.zip $global_dir mv cn_result.zip $WORKSPACE/${apiexample_cn_name}_${sdk_version}_APIExample.zip mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip + echo "complete compress api example" + ls -al fi if [ $compile_project = true ]; then diff --git a/iOS/APIExample/cloud_project.sh b/iOS/APIExample/cloud_project.sh index 6580342d3..bd3a68915 100755 --- a/iOS/APIExample/cloud_project.sh +++ b/iOS/APIExample/cloud_project.sh @@ -33,21 +33,5 @@ sed -i -e "s#\# pod 'SenseLib'# pod 'SenseLib'#g" Podfile sed -i -e "s#\# pod 'bytedEffect'# pod 'bytedEffect'#g" Podfile sed -i -e "s#\# pod 'fuLib'# pod 'fuLib'#g" Podfile -echo "work space: $WORKSPACE" -echo "project path: $PROJECT_PATH" - pod install --repo-update || exit 1 -#工程文件路径 -APP_PATH="$(ls | grep xcworkspace)" - -# 项目target名 -TARGET_NAME=${APP_PATH%%.*} - -7za a -tzip ${TARGET_NAME}.zip -r ./* > log.txt - -echo "pwd path: $PWD" -ls -al -echo "target name: $TARGET_NAME" -OUTPUT_FILE=${WORKSPACE}/${TARGET_NAME}_$(date "+%Y%m%d%H%M%S").zip -mv ${TARGET_NAME}.zip $OUTPUT_FILE From cdaebd2dfecd56f520ab120449947f75aae9a23e Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 15:27:48 +0800 Subject: [PATCH 19/32] Add log code --- .github/ci/build/build_ios.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index b99247d10..533ceb0ed 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -120,11 +120,13 @@ if [ $compress_apiexample = true ]; then echo "start compress api example" 7za a -tzip cn_result.zip $cn_dir 7za a -tzip global_result.zip $global_dir + echo "complete compress api example" + echo "current path: `pwd`" + ls -al mv cn_result.zip $WORKSPACE/${apiexample_cn_name}_${sdk_version}_APIExample.zip mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip - echo "complete compress api example" - ls -al + fi if [ $compile_project = true ]; then From d1bd547d7979e3b2dd134d2b62fbb8ab3094db79 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 15:34:28 +0800 Subject: [PATCH 20/32] Test ci --- .github/ci/build/build_ios.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 533ceb0ed..b575b2020 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -123,10 +123,12 @@ if [ $compress_apiexample = true ]; then echo "complete compress api example" echo "current path: `pwd`" ls -al - - mv cn_result.zip $WORKSPACE/${apiexample_cn_name}_${sdk_version}_APIExample.zip - mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip - + cn_des_path=$WORKSPACE/${apiexample_cn_name}_${sdk_version}_APIExample.zip + global_des_path=$WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip + echo "cn_des_path: $cn_des_path" + echo "global_des_path: $global_des_path" + mv cn_result.zip $cn_des_path + mv global_result.zip $global_des_path fi if [ $compile_project = true ]; then From e0c67aa8fcea0f4d530e3b2d9602286cc4dfa176 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 15:51:24 +0800 Subject: [PATCH 21/32] Add log --- .github/ci/build/build_ios.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index b575b2020..027cdc366 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -127,8 +127,18 @@ if [ $compress_apiexample = true ]; then global_des_path=$WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip echo "cn_des_path: $cn_des_path" echo "global_des_path: $global_des_path" - mv cn_result.zip $cn_des_path - mv global_result.zip $global_des_path + echo "Moving cn_result.zip to $cn_des_path..." + mv cn_result.zip $cn_des_path 2>&1 + if [ $? -ne 0 ]; then + echo "Failed to move cn_result.zip to $cn_des_path. Error: $(mv cn_result.zip $cn_des_path 2>&1)" + fi + + mv global_result.zip $global_des_path 2>&1 + if [ $? -ne 0 ]; then + echo "Failed to move global_result.zip to $global_des_path. Error: $(mv global_result.zip $global_des_path 2>&1)" + fi + + ls -al $WORKSPACE/ fi if [ $compile_project = true ]; then From 2d86bc5e0b2d25ef63891b4e73df7cadda9373f2 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 16:44:01 +0800 Subject: [PATCH 22/32] App build number to zip name --- .github/ci/build/build_ios.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 027cdc366..3246b86bc 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -123,20 +123,15 @@ if [ $compress_apiexample = true ]; then echo "complete compress api example" echo "current path: `pwd`" ls -al - cn_des_path=$WORKSPACE/${apiexample_cn_name}_${sdk_version}_APIExample.zip - global_des_path=$WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip + cn_des_path=$WORKSPACE/${apiexample_cn_name}_${sdk_version}_${BUILD_NUMBER}_APIExample.zip + global_des_path=$WORKSPACE/${apiexample_global_name}_${sdk_version}_${BUILD_NUMBER}_APIExample.zip echo "cn_des_path: $cn_des_path" - echo "global_des_path: $global_des_path" - echo "Moving cn_result.zip to $cn_des_path..." - mv cn_result.zip $cn_des_path 2>&1 - if [ $? -ne 0 ]; then - echo "Failed to move cn_result.zip to $cn_des_path. Error: $(mv cn_result.zip $cn_des_path 2>&1)" - fi + echo "Moving cn_result.zip to $cn_des_path" + mv cn_result.zip $cn_des_path - mv global_result.zip $global_des_path 2>&1 - if [ $? -ne 0 ]; then - echo "Failed to move global_result.zip to $global_des_path. Error: $(mv global_result.zip $global_des_path 2>&1)" - fi + echo "global_des_path: $global_des_path" + echo "Moving global_result.zip to $global_des_path" + mv global_result.zip $global_des_path ls -al $WORKSPACE/ fi From b15b0183a9c5e1c7184cbda4209909acd3e8b9a0 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 17:38:10 +0800 Subject: [PATCH 23/32] Modify mac script --- .github/ci/build/build_mac.sh | 4 ++-- macOS/ExportOptions.plist | 8 ++++---- macOS/cloud_build.sh | 8 ++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/ci/build/build_mac.sh b/.github/ci/build/build_mac.sh index 53be5bc3f..100998d8b 100644 --- a/.github/ci/build/build_mac.sh +++ b/.github/ci/build/build_mac.sh @@ -115,8 +115,8 @@ if [ $compress_apiexample = true ]; then 7za a -tzip cn_result.zip $cn_dir > log.txt 7za a -tzip global_result.zip $global_dir > log.txt - mv cn_result.zip $WORKSPACE/${apiexample_cn_name}_${sdk_version}_APIExample.zip - mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}_APIExample.zip + mv cn_result.zip $WORKSPACE/${apiexample_cn_name}_${sdk_version}_${BUILD_NUMBER}_APIExample.zip + mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}${BUILD_NUMBER}_APIExample.zip fi if [ $compile_project = true ]; then diff --git a/macOS/ExportOptions.plist b/macOS/ExportOptions.plist index cbad22e1e..d85797e0a 100644 --- a/macOS/ExportOptions.plist +++ b/macOS/ExportOptions.plist @@ -5,17 +5,17 @@ destination export method - developer-id + developer provisioningProfiles io.agora.api.examples - apiexamplemac + AgoraLab2020 signingCertificate - 35CC30DFC3AA90845718DE3E28DFD32DB1A672BF + Apple Development signingStyle manual teamID - YS397FG5PA + JDPG69R49Z diff --git a/macOS/cloud_build.sh b/macOS/cloud_build.sh index 556a8fc25..95285c8e1 100755 --- a/macOS/cloud_build.sh +++ b/macOS/cloud_build.sh @@ -73,6 +73,14 @@ ARCHIVE_PATH="${WORKSPACE}/${TARGET_NAME}_${BUILD_NUMBER}.xcarchive" # plist路径 PLIST_PATH="${PROJECT_PATH}/ExportOptions.plist" +# 先获取原始值 +value1=$(/usr/libexec/PlistBuddy -c "Print :provisioningProfiles:io.agora.api.examples" "$PLIST_PATH") + +# 删除原始键 +/usr/libexec/PlistBuddy -c "Delete :provisioningProfiles:io.agora.api.examples" "$PLIST_PATH" + +# 添加新键和值 +/usr/libexec/PlistBuddy -c "Add :provisioningProfiles:io.agora.entfull string $value1" "$PLIST_PATH" # archive 这边使用的工作区间 也可以使用project xcodebuild archive -workspace "${APP_PATH}" -scheme "${TARGET_NAME}" -configuration "${CONFIGURATION}" -archivePath "${ARCHIVE_PATH}" From daa25e13aa81cc423cd982ef8af88f66582909a9 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 17:46:30 +0800 Subject: [PATCH 24/32] Add log --- macOS/cloud_build.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/macOS/cloud_build.sh b/macOS/cloud_build.sh index 95285c8e1..76e2401a4 100755 --- a/macOS/cloud_build.sh +++ b/macOS/cloud_build.sh @@ -73,14 +73,7 @@ ARCHIVE_PATH="${WORKSPACE}/${TARGET_NAME}_${BUILD_NUMBER}.xcarchive" # plist路径 PLIST_PATH="${PROJECT_PATH}/ExportOptions.plist" -# 先获取原始值 -value1=$(/usr/libexec/PlistBuddy -c "Print :provisioningProfiles:io.agora.api.examples" "$PLIST_PATH") - -# 删除原始键 -/usr/libexec/PlistBuddy -c "Delete :provisioningProfiles:io.agora.api.examples" "$PLIST_PATH" - -# 添加新键和值 -/usr/libexec/PlistBuddy -c "Add :provisioningProfiles:io.agora.entfull string $value1" "$PLIST_PATH" +echo PLIST_PATH: $PLIST_PATH # archive 这边使用的工作区间 也可以使用project xcodebuild archive -workspace "${APP_PATH}" -scheme "${TARGET_NAME}" -configuration "${CONFIGURATION}" -archivePath "${ARCHIVE_PATH}" @@ -90,6 +83,8 @@ cd ${WORKSPACE} # 压缩archive 7za a -tzip "${TARGET_NAME}_${BUILD_NUMBER}.xcarchive.zip" "${ARCHIVE_PATH}" +echo "start sign..." + # 签名 sh sign "${WORKSPACE}/${TARGET_NAME}_${BUILD_NUMBER}.xcarchive.zip" --type xcarchive --plist "${PLIST_PATH}" --application macApp From 5e8d5a2e0ee9d8c01e24863f9b157a9da5a674aa Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 18:07:26 +0800 Subject: [PATCH 25/32] Modify mac ci script --- macOS/cloud_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macOS/cloud_build.sh b/macOS/cloud_build.sh index 76e2401a4..5a3b0ab86 100755 --- a/macOS/cloud_build.sh +++ b/macOS/cloud_build.sh @@ -32,12 +32,12 @@ PBXPROJ_PATH=${TARGET_NAME}.xcodeproj/project.pbxproj # Debug /usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:CODE_SIGN_STYLE 'Manual'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:CODE_SIGN_IDENTITY 'Developer ID Application'" $PBXPROJ_PATH -/usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:DEVELOPMENT_TEAM 'YS397FG5PA'" $PBXPROJ_PATH +/usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:DEVELOPMENT_TEAM 'GM72UGLGZW'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:PROVISIONING_PROFILE_SPECIFIER 'apiexamplemac'" $PBXPROJ_PATH # Release /usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:CODE_SIGN_STYLE 'Manual'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:CODE_SIGN_IDENTITY 'Developer ID Application'" $PBXPROJ_PATH -/usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:DEVELOPMENT_TEAM 'YS397FG5PA'" $PBXPROJ_PATH +/usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:DEVELOPMENT_TEAM 'GM72UGLGZW'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:PROVISIONING_PROFILE_SPECIFIER 'apiexamplemac'" $PBXPROJ_PATH #修改build number From 85ed6d9b2e0126c73102a04f433bc95243fd4880 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 18:10:27 +0800 Subject: [PATCH 26/32] Fix issues --- macOS/cloud_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macOS/cloud_build.sh b/macOS/cloud_build.sh index 5a3b0ab86..ef209d932 100755 --- a/macOS/cloud_build.sh +++ b/macOS/cloud_build.sh @@ -33,12 +33,12 @@ PBXPROJ_PATH=${TARGET_NAME}.xcodeproj/project.pbxproj /usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:CODE_SIGN_STYLE 'Manual'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:CODE_SIGN_IDENTITY 'Developer ID Application'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:DEVELOPMENT_TEAM 'GM72UGLGZW'" $PBXPROJ_PATH -/usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:PROVISIONING_PROFILE_SPECIFIER 'apiexamplemac'" $PBXPROJ_PATH +/usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:PROVISIONING_PROFILE_SPECIFIER 'App'" $PBXPROJ_PATH # Release /usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:CODE_SIGN_STYLE 'Manual'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:CODE_SIGN_IDENTITY 'Developer ID Application'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:DEVELOPMENT_TEAM 'GM72UGLGZW'" $PBXPROJ_PATH -/usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:PROVISIONING_PROFILE_SPECIFIER 'apiexamplemac'" $PBXPROJ_PATH +/usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:PROVISIONING_PROFILE_SPECIFIER 'App'" $PBXPROJ_PATH #修改build number # Debug From 646a4dad89120ae6bad58ee34c3627a2612f8d0c Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 18:22:38 +0800 Subject: [PATCH 27/32] Fix issues --- macOS/cloud_build.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/macOS/cloud_build.sh b/macOS/cloud_build.sh index ef209d932..ecf482327 100755 --- a/macOS/cloud_build.sh +++ b/macOS/cloud_build.sh @@ -40,6 +40,16 @@ PBXPROJ_PATH=${TARGET_NAME}.xcodeproj/project.pbxproj /usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:DEVELOPMENT_TEAM 'GM72UGLGZW'" $PBXPROJ_PATH /usr/libexec/PlistBuddy -c "Set :objects:03896D5424F8A011008593CD:buildSettings:PROVISIONING_PROFILE_SPECIFIER 'App'" $PBXPROJ_PATH +# SimpleFilter +# Debug +/usr/libexec/PlistBuddy -c "Set :objects:8BD4AE7E272518D600E95B87:buildSettings:CODE_SIGN_STYLE 'Manual'" $PBXPROJ_PATH +/usr/libexec/PlistBuddy -c "Set :objects:8BD4AE7E272518D600E95B87:buildSettings:DEVELOPMENT_TEAM ''" $PBXPROJ_PATH +/usr/libexec/PlistBuddy -c "Set :objects:8BD4AE7E272518D600E95B87:buildSettings:PROVISIONING_PROFILE_SPECIFIER ''" $PBXPROJ_PATH +# Release +/usr/libexec/PlistBuddy -c "Set :objects:8BD4AE7F272518D600E95B87:buildSettings:CODE_SIGN_STYLE 'Manual'" $PBXPROJ_PATH +/usr/libexec/PlistBuddy -c "Set :objects:8BD4AE7F272518D600E95B87:buildSettings:DEVELOPMENT_TEAM ''" $PBXPROJ_PATH +/usr/libexec/PlistBuddy -c "Set :objects:8BD4AE7F272518D600E95B87:buildSettings:PROVISIONING_PROFILE_SPECIFIER ''" $PBXPROJ_PATH + #修改build number # Debug /usr/libexec/PlistBuddy -c "Set :objects:03896D5324F8A011008593CD:buildSettings:CURRENT_PROJECT_VERSION ${BUILD_NUMBER}" $PBXPROJ_PATH From 22b7d55c4cb42beef192914df8e6e3f6ea8d9944 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 18:46:14 +0800 Subject: [PATCH 28/32] Modify script --- .github/ci/build/build_mac.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/ci/build/build_mac.sh b/.github/ci/build/build_mac.sh index 100998d8b..9c45a9679 100644 --- a/.github/ci/build/build_mac.sh +++ b/.github/ci/build/build_mac.sh @@ -37,6 +37,7 @@ # pr: output test.zip to workspace dir # others: Rename the zip package name yourself, But need copy it to workspace dir ################################## +export PATH=$PATH:/opt/homebrew/bin echo compile_project:$compile_project echo Package_Publish: $Package_Publish @@ -119,10 +120,10 @@ if [ $compress_apiexample = true ]; then mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}${BUILD_NUMBER}_APIExample.zip fi -if [ $compile_project = true ]; then - cd ./$unzip_name/samples/APIExample - ./cloud_build.sh || exit 1 - cd - -fi +#if [ $compile_project = true ]; then +# cd ./$unzip_name/samples/APIExample +# ./cloud_build.sh || exit 1 +# cd - +#fi From e82ac4436d26b037a3f44ebb3f6ffeb834b73440 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 18:59:30 +0800 Subject: [PATCH 29/32] Modify the SDK version number --- iOS/APIExample/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/APIExample/Podfile b/iOS/APIExample/Podfile index 1c44e5a01..cf913424b 100644 --- a/iOS/APIExample/Podfile +++ b/iOS/APIExample/Podfile @@ -4,7 +4,7 @@ #source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' def common_pods - pod 'AgoraRtcEngine_iOS', '4.5.1' + pod 'AgoraRtcEngine_iOS', '4.5.2' #pod 'sdk', :path => 'sdk.podspec' end From 4c7b3c09246f92df6e000722aa4ed284ee6fe965 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 19:16:55 +0800 Subject: [PATCH 30/32] Save scheme item --- iOS/.gitignore | 1 - .../xcschemes/APIExample-SwiftUI.xcscheme | 78 +++++++++++++++ .../Agora-ScreenShare-Extension.xcscheme | 97 +++++++++++++++++++ .../xcschemes/APIExample.xcscheme | 78 +++++++++++++++ .../Agora-ScreenShare-Extension.xcscheme | 97 +++++++++++++++++++ .../xcschemes/APIExample.xcscheme | 78 +++++++++++++++ .../Agora-ScreenShare-Extension.xcscheme | 96 ++++++++++++++++++ 7 files changed, 524 insertions(+), 1 deletion(-) create mode 100644 iOS/APIExample-SwiftUI/APIExample-SwiftUI.xcodeproj/xcshareddata/xcschemes/APIExample-SwiftUI.xcscheme create mode 100644 iOS/APIExample-SwiftUI/APIExample-SwiftUI.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme create mode 100644 iOS/APIExample.xcodeproj/xcshareddata/xcschemes/APIExample.xcscheme create mode 100644 iOS/APIExample.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme create mode 100644 iOS/APIExample/APIExample.xcodeproj/xcshareddata/xcschemes/APIExample.xcscheme create mode 100644 iOS/APIExample/APIExample.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme diff --git a/iOS/.gitignore b/iOS/.gitignore index 18ac78184..d39e42089 100644 --- a/iOS/.gitignore +++ b/iOS/.gitignore @@ -4,7 +4,6 @@ *.xcscmblueprint *.framework *.xcworkspacedata -xcshareddata *.zip agora_sdk diff --git a/iOS/APIExample-SwiftUI/APIExample-SwiftUI.xcodeproj/xcshareddata/xcschemes/APIExample-SwiftUI.xcscheme b/iOS/APIExample-SwiftUI/APIExample-SwiftUI.xcodeproj/xcshareddata/xcschemes/APIExample-SwiftUI.xcscheme new file mode 100644 index 000000000..43d4de21c --- /dev/null +++ b/iOS/APIExample-SwiftUI/APIExample-SwiftUI.xcodeproj/xcshareddata/xcschemes/APIExample-SwiftUI.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iOS/APIExample-SwiftUI/APIExample-SwiftUI.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme b/iOS/APIExample-SwiftUI/APIExample-SwiftUI.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme new file mode 100644 index 000000000..f0441d8b9 --- /dev/null +++ b/iOS/APIExample-SwiftUI/APIExample-SwiftUI.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iOS/APIExample.xcodeproj/xcshareddata/xcschemes/APIExample.xcscheme b/iOS/APIExample.xcodeproj/xcshareddata/xcschemes/APIExample.xcscheme new file mode 100644 index 000000000..e81351701 --- /dev/null +++ b/iOS/APIExample.xcodeproj/xcshareddata/xcschemes/APIExample.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iOS/APIExample.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme b/iOS/APIExample.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme new file mode 100644 index 000000000..dcf57568b --- /dev/null +++ b/iOS/APIExample.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iOS/APIExample/APIExample.xcodeproj/xcshareddata/xcschemes/APIExample.xcscheme b/iOS/APIExample/APIExample.xcodeproj/xcshareddata/xcschemes/APIExample.xcscheme new file mode 100644 index 000000000..24009601b --- /dev/null +++ b/iOS/APIExample/APIExample.xcodeproj/xcshareddata/xcschemes/APIExample.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iOS/APIExample/APIExample.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme b/iOS/APIExample/APIExample.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme new file mode 100644 index 000000000..c6b492911 --- /dev/null +++ b/iOS/APIExample/APIExample.xcodeproj/xcshareddata/xcschemes/Agora-ScreenShare-Extension.xcscheme @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From af3d9a15faeb67a1bc0977ce2098511efb4891fc Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 19:41:56 +0800 Subject: [PATCH 31/32] Fix --- iOS/APIExample/cloud_project.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iOS/APIExample/cloud_project.sh b/iOS/APIExample/cloud_project.sh index bd3a68915..e6cdf6200 100755 --- a/iOS/APIExample/cloud_project.sh +++ b/iOS/APIExample/cloud_project.sh @@ -26,12 +26,12 @@ unzip -o vender_fu_iOS.zip rm -f vender_fu_iOS.zip #打开第三方播放器配置 -sed -i -e "s#\# pod 'ijkplayer'# pod 'ijkplayer'#g" Podfile +perl -i -pe "s#\# pod 'ijkplayer'# pod 'ijkplayer'#g" Podfile #打开第三方美颜 -sed -i -e "s#\# pod 'SenseLib'# pod 'SenseLib'#g" Podfile -sed -i -e "s#\# pod 'bytedEffect'# pod 'bytedEffect'#g" Podfile -sed -i -e "s#\# pod 'fuLib'# pod 'fuLib'#g" Podfile +perl -i -pe "s#\# pod 'SenseLib'# pod 'SenseLib'#g" Podfile +perl -i -pe "s#\# pod 'bytedEffect'# pod 'bytedEffect'#g" Podfile +perl -i -pe "s#\# pod 'fuLib'# pod 'fuLib'#g" Podfile pod install --repo-update || exit 1 From 38316079f7293a04633bfbd20565214de34f2d84 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Thu, 24 Apr 2025 19:56:47 +0800 Subject: [PATCH 32/32] Fix issues --- iOS/APIExample/cloud_project.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iOS/APIExample/cloud_project.sh b/iOS/APIExample/cloud_project.sh index e6cdf6200..52c7e703e 100755 --- a/iOS/APIExample/cloud_project.sh +++ b/iOS/APIExample/cloud_project.sh @@ -29,9 +29,9 @@ rm -f vender_fu_iOS.zip perl -i -pe "s#\# pod 'ijkplayer'# pod 'ijkplayer'#g" Podfile #打开第三方美颜 -perl -i -pe "s#\# pod 'SenseLib'# pod 'SenseLib'#g" Podfile -perl -i -pe "s#\# pod 'bytedEffect'# pod 'bytedEffect'#g" Podfile -perl -i -pe "s#\# pod 'fuLib'# pod 'fuLib'#g" Podfile +perl -i -pe "s#\#pod 'SenseLib'#pod 'SenseLib'#g" Podfile +perl -i -pe "s#\#pod 'bytedEffect'#pod 'bytedEffect'#g" Podfile +perl -i -pe "s#\#pod 'fuLib'#pod 'fuLib'#g" Podfile pod install --repo-update || exit 1