Merge pull request #459 from AgoraIO/dev/4.6.0

Dev/4.6.0

Author: Smaug-77

.github/ci/build/build_android.groovy

@@ -7,7 +7,6 @@ buildUtils = new agora.build.BuildUtils()
 
 compileConfig = [
     "sourceDir": "api-examples",
-    "docker": "hub.agoralab.co/server/apiexample_build_android:latest",
     "non-publish": [
         "command": "./.github/ci/build/build_android.sh",
         "extraArgs": "",
@@ -64,4 +63,4 @@ def doPublish(buildVariables) {
     sh "rm -rf *.zip *.apk || true"
 }
 
-pipelineLoad(this, "ApiExample", "build", "android", "apiexample_linux")
+pipelineLoad(this, "ApiExample", "build", "android", "RTC-Sample")

.github/ci/build/build_android.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 Package_Publish: $Package_Publish
 echo is_tag_fetch: $is_tag_fetch
@@ -49,6 +50,8 @@ echo release_version: $release_version
 echo short_version: $short_version
 echo pwd: `pwd`
 echo sdk_url: $sdk_url
+echo android_direction: $android_direction
+
 unzip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT
 zip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT.zip
 if [ -z "$sdk_url" ] || [ "$sdk_url" = "none" ]; then
@@ -63,33 +66,46 @@ else
 	curl -o $zip_name $sdk_url || exit 1
 	7za x ./$zip_name -y > log.txt
 
-	unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
+	# Support top-level directory name containing 'Agora' or 'Shengwang'
+	unzip_name=`ls -S -d */ | grep -E 'Agora|Shengwang' | head -n 1 | sed 's/\///g'`
+	if [ -z "$unzip_name" ]; then
+		echo "Error: Unzipped directory not found. The SDK package structure may be invalid or the top-level directory does not contain 'Agora' or 'Shengwang'"
+		exit 1
+	fi
 	echo unzip_name: $unzip_name
 
 	rm -rf ./$unzip_name/rtc/bin
 	rm -rf ./$unzip_name/rtc/demo
-	rm ./$unzip_name/rtc/commits
-	rm ./$unzip_name/rtc/package_size_report.txt
+	rm -f ./$unzip_name/.commits
+	rm -f ./$unzip_name/spec
 	rm -rf ./$unzip_name/pom
 fi
-mkdir -p ./$unzip_name/rtc/samples 
-cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
+
+mkdir -p ./$unzip_name/rtc/samples/${android_direction} || exit 1
+rm -rf ./$unzip_name/rtc/samples/${android_direction}/*
+
+if [ -d "./Android/${android_direction}" ]; then
+    cp -rf ./Android/${android_direction}/* ./$unzip_name/rtc/samples/${android_direction}/ || exit 1
+else
+    echo "Error: Source directory ./Android/${android_direction} does not exist"
+    exit 1
+fi
+
 7za a -tzip result.zip -r $unzip_name > log.txt
 mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
 
+if [ $compress_apiexample = true ]; then
+	onlyCodeZipName=${android_direction}_onlyCode.zip
+	7za a -tzip $onlyCodeZipName -r ./$unzip_name/rtc/samples/${android_direction} >> log.txt
+	mv $onlyCodeZipName $WORKSPACE/APIExample_onlyCode_${BUILD_NUMBER}_$zip_name
+fi
+
 if [ $compile_project = true ]; then
-	# install android sdk
-	which java
-	java --version
-	source ~/.bashrc
-	export ANDROID_HOME=/usr/lib/android_sdk
-	echo ANDROID_HOME: $ANDROID_HOME
-	cd ./$unzip_name/rtc/samples/API-Example || exit 1
+	cd ./$unzip_name/rtc/samples/${android_direction} || exit 1
 	if [ -z "$sdk_url" ] || [ "$sdk_url" = "none" ]; then
 		./cloud_build.sh false || exit 1
 	else
 		./cloud_build.sh true || exit 1
 	fi
 fi
 
-

.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")
+pipelineLoad(this, "ApiExample", "build", "ios", "RTC-Sample")

.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
@@ -61,7 +63,11 @@ export LANG=en_US.UTF-8
 unzip_name=Agora_Native_SDK_for_iOS_FULL
 zip_name=output.zip
 sdk_url_flag=false
-if [ -z "$sdk_url" ]; then
+apiexample_cn_name=Shengwang_Native_SDK_for_iOS
+apiexample_global_name=Agora_Native_SDK_for_iOS
+global_dir=Global
+
+if [ -z "$sdk_url" -o "$sdk_url" = "none" ]; then
    sdk_url_flag=false
    echo "sdk_url is empty"
    echo unzip_name: $unzip_name 
@@ -74,7 +80,7 @@ else
    echo zip_name: $zip_name
    curl -o $zip_name $sdk_url || exit 1
    7za x ./$zip_name -y > log.txt
-   unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
+   unzip_name=`ls -S -d */ | egrep 'Agora|Shengwang' | sed 's/\///g'`
    echo unzip_name: $unzip_name
    rm -rf ./$unzip_name/bin
    rm -f ./$unzip_name/commits
@@ -99,6 +105,26 @@ 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 [ $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"
+    
+    cp -rf ./iOS/${ios_direction} $global_dir/
+   
+    echo "start compress api example"
+    7za a -tzip global_result.zip $global_dir    
+    echo "complete compress api example"
+    echo "current path: `pwd`"
+    ls -al
+    global_des_path=$WORKSPACE/${apiexample_global_name}_${sdk_version}_${BUILD_NUMBER}_APIExample.zip
+  
+    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 
+
 if [ $compile_project = true ]; then
 	cd ./$unzip_name/samples/${ios_direction}
 	./cloud_build.sh || exit 1

.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")
+pipelineLoad(this, "ApiExample", "build", "mac", "RTC-Sample")

.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
@@ -59,6 +60,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
@@ -74,7 +79,7 @@ else
    echo unzip_name: $unzip_name
    curl -o $zip_name $sdk_url || exit 1
    7za x ./$zip_name -y > log.txt
-   unzip_name=`ls -S -d */ | grep Agora`
+   unzip_name=`ls -S -d */ | egrep 'Agora|Shengwang' | sed 's/\///g'`
    echo unzip_name: $unzip_name
 
    rm -rf ./$unzip_name/bin
@@ -92,13 +97,33 @@ 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 [ $compile_project = true ]; then
-    cd ./$unzip_name/samples/APIExample
-    ./cloud_build.sh || exit 1
+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 -
-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}_${BUILD_NUMBER}_APIExample.zip
+    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
 
 

.github/ci/build/modify_ios_keycenter.py

@@ -2,6 +2,7 @@
 
 def modfiy(path, isReset):
     appId = os.environ.get('APP_ID')
+    faceCaptureLicense = os.environ.get('FACE_CAPTURE_LICENSE')
     with open(path, 'r', encoding='utf-8') as file:
         contents = []
         for num, line in enumerate(file):
@@ -16,6 +17,11 @@ def modfiy(path, isReset):
                     line = "static let Certificate: String? = <#YOUR Certificate#>"
                 else:
                     line = 'static let Certificate: String? = nil'
+            elif "static let FaceCaptureLicense" in line:
+                if isReset:
+                    line = "static let FaceCaptureLicense: String? = nil"
+                else:
+                    line = f'static let FaceCaptureLicense: String? = "{faceCaptureLicense}"'
             elif "static NSString * const APPID" in line:
                 if isReset:
                     line = "static NSString * const APPID = <#YOUR APPID#>"