Skip to content

Commit 1d81ec6

Browse files
Smaug-77Smaug-77
authored
Merge pull request #460 from AgoraIO/dev/4.6.0
Dev/4.6.0
2 parents 791c966 + f8a8562 commit 1d81ec6

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

‎.github/ci/build/build_mac.sh‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ cn_dir=CN
6666
global_dir=Global
6767

6868
echo zip_name: $zip_name
69-
if [ -z "$sdk_url" ]; then
69+
if [ -z "$sdk_url" -o "$sdk_url" = "none" ]; then
7070
sdk_url_flag=false
7171
echo "sdk_url is empty"
7272
echo unzip_name: $unzip_name
@@ -99,31 +99,30 @@ fi
9999
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/APIExample/Podfile $sdk_url_flag
100100

101101
echo "start compress"
102-
7za a -tzip result.zip -r $unzip_name
103-
cp result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
102+
7za a -tzip result.zip -r $unzip_name > log.txt
103+
echo "start move to"
104+
echo $WORKSPACE/with${BUILD_NUMBER}_$zip_name
105+
mv result.zip $WORKSPACE/with_${BUILD_NUMBER}_$zip_name
104106

105107
if [ $compress_apiexample = true ]; then
106-
sdk_version=$(grep "pod 'AgoraRtcEngine_iOS'" ./iOS/${ios_direction}/Podfile | sed -n "s/.*'\([0-9.]*\)'.*/\1/p")
108+
sdk_version=$(grep "pod 'AgoraRtcEngine_macOS'" ./macOS/Podfile | sed -n "s/.*'\([0-9.]*\)'.*/\1/p")
107109
echo "sdk_version: $sdk_version"
108110

109-
mkdir -p $cn_dir $global_dir
110-
cp -rf ./iOS/${ios_direction} $cn_dir/
111-
cp -rf ./iOS/${ios_direction} $global_dir/
112-
cd $cn_dir/${ios_direction}
113-
./cloud_project.sh || exit 1
114-
cd -
111+
cp -rf ./macOS $global_dir/
112+
115113
echo "start compress api example"
116-
7za a -tzip cn_result.zip $cn_dir > log.txt
117-
7za a -tzip global_result.zip $global_dir > log.txt
118-
119-
mv cn_result.zip $WORKSPACE/${apiexample_cn_name}_${sdk_version}_${BUILD_NUMBER}_APIExample.zip
120-
mv global_result.zip $WORKSPACE/${apiexample_global_name}_${sdk_version}${BUILD_NUMBER}_APIExample.zip
121-
fi
114+
7za a -tzip global_result.zip $global_dir
115+
echo "complete compress api example"
116+
echo "current path: `pwd`"
117+
ls -al
118+
global_des_path=$WORKSPACE/${apiexample_global_name}_${sdk_version}_${BUILD_NUMBER}_APIExample.zip
119+
120+
echo "global_des_path: $global_des_path"
121+
echo "Moving global_result.zip to $global_des_path"
122+
mv global_result.zip $global_des_path
123+
124+
ls -al $WORKSPACE/
125+
fi
122126

123-
#if [ $compile_project = true ]; then
124-
# cd ./$unzip_name/samples/APIExample
125-
# ./cloud_build.sh || exit 1
126-
# cd -
127-
#fi
128127

129128

‎Android/APIExample/cloud_build.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ else
3131
fi
3232

3333
#change android maven to china repos
34-
sed -ie "s#google()#maven { url \"https\://maven.aliyun.com/repository/public\" }\n google()#g" settings.gradle
35-
sed -ie "s#https://services.gradle.org/distributions#https://mirrors.cloud.tencent.com/gradle#g" gradle/wrapper/gradle-wrapper.properties
34+
#sed -ie "s#google()#maven { url \"https\://maven.aliyun.com/repository/public\" }\n google()#g" settings.gradle
35+
#sed -ie "s#https://services.gradle.org/distributions#https://mirrors.cloud.tencent.com/gradle#g"
36+
# gradle/wrapper/gradle-wrapper.properties
3637

3738
## config appId
3839
sed -i -e "s#YOUR APP ID#${APP_ID}#g" app/src/main/res/values/string_configs.xml

‎iOS/APIExample-Audio/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ target 'APIExample-Audio' do
77

88
pod 'Floaty', '~> 4.2.0'
99
pod 'AGEVideoLayout', '~> 1.0.2'
10-
# pod 'AgoraAudio_iOS', '4.5.2'
11-
pod 'sdk', :path => 'sdk.podspec'
10+
pod 'AgoraAudio_iOS', '4.6.0'
11+
# pod 'sdk', :path => 'sdk.podspec'
1212
end
1313

1414
pre_install do |installer|

‎iOS/APIExample-OC/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# platform :ios, '9.0'
33

44
def common_pods
5-
# pod 'AgoraRtcEngine_iOS', '4.5.2'
6-
pod 'sdk', :path => 'sdk.podspec'
5+
pod 'AgoraRtcEngine_iOS', '4.6.0'
6+
# pod 'sdk', :path => 'sdk.podspec'
77
end
88

99
target 'APIExample-OC' do

‎iOS/APIExample-SwiftUI/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# platform :ios, '9.0'
33

44
def common_pods
5-
# pod 'AgoraRtcEngine_iOS', '4.5.2'
6-
pod 'sdk', :path => 'sdk.podspec'
5+
pod 'AgoraRtcEngine_iOS', '4.6.0'
6+
# pod 'sdk', :path => 'sdk.podspec'
77
end
88

99
target 'APIExample-SwiftUI' do

‎iOS/APIExample/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
55

66
def common_pods
7-
# pod 'AgoraRtcEngine_iOS', '4.5.2'
8-
pod 'sdk', :path => 'sdk.podspec'
7+
pod 'AgoraRtcEngine_iOS', '4.6.0'
8+
# pod 'sdk', :path => 'sdk.podspec'
99
end
1010

1111
target 'APIExample' do

‎macOS/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
def common_pods
5-
# pod 'AgoraRtcEngine_macOS', '4.5.2'
6-
pod 'sdk', :path => 'sdk.podspec'
5+
pod 'AgoraRtcEngine_macOS', '4.6.0'
6+
# pod 'sdk', :path => 'sdk.podspec'
77
end
88

99
target 'APIExample' do

0 commit comments

Comments
 (0)