Skip to content

Commit 757ed01

Browse files
author
qinhui
committed
When the SDK link is empty, do not download the SDK.
1 parent d2a01fd commit 757ed01

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

.github/ci/build/build_ios.sh

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,28 @@ echo sdk_url: $sdk_url
5656
zip_name=${sdk_url##*/}
5757
echo zip_name: $zip_name
5858

59-
curl -o $zip_name $sdk_url || exit 1
60-
7za x ./$zip_name -y > log.txt
59+
if [ "$sdk_url" != "" ]; then
60+
echo "sdk_url: $sdk_url"
61+
curl -o $zip_name $sdk_url || exit 1
62+
7za x ./$zip_name -y > log.txt
6163

62-
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
63-
echo unzip_name: $unzip_name
64-
65-
rm -rf ./$unzip_name/bin
66-
rm ./$unzip_name/commits
67-
rm ./$unzip_name/package_size_report.txt
68-
mkdir ./$unzip_name/samples
69-
70-
cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/API-Example || exit 1
71-
ls -al ./$unzip_name/samples/API-Example/
72-
mv ./$unzip_name/samples/API-Example/sdk.podspec ./$unzip_name/ || exit 1
64+
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
65+
echo unzip_name: $unzip_name
66+
rm -rf ./$unzip_name/bin
67+
rm ./$unzip_name/commits
68+
rm ./$unzip_name/package_size_report.txt
69+
70+
mkdir ./$unzip_name/samples
71+
cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/API-Example || exit 1
72+
ls -al ./$unzip_name/samples/API-Example/
73+
mv ./$unzip_name/samples/API-Example/sdk.podspec ./$unzip_name/ || exit 1
74+
else
75+
echo "sdk_url is empty!"
76+
cp -rf ./iOS/${ios_direction} ./ || exit 1
77+
fi
7378

7479
echo "work space1: $WORKSPACE"
75-
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/API-Example/Podfile || exit 1
76-
80+
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/API-Example/Podfile $sdk_url || exit 1
7781

7882
7za a -tzip result.zip -r $unzip_name > log.txt
7983
mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name

.github/ci/build/modify_podfile.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import os, sys
22

3-
def modfiy(path):
3+
def modfiy(path, sdk_url):
44
with open(path, 'r', encoding='utf-8') as file:
55
contents = []
66
for num, line in enumerate(file):
77
if "pod 'Agora" in line:
8-
line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
8+
if sdk_url != "":
9+
line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
910
elif "pod 'sdk" in line:
1011
line = ""
1112
elif 'sh .download_script' in line:
@@ -20,5 +21,6 @@ def modfiy(path):
2021

2122

2223
if __name__ == '__main__':
23-
path = sys.argv[1:][0]
24-
modfiy(path.strip())
24+
path = sys.argv[1]
25+
sdk_url = sys.argv[2]
26+
modfiy(path.strip(), sdk_url.strip())

iOS/APIExample/Podfile

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

66
def common_pods
7-
pod 'AgoraRtcEngine_iOS', '4.5.0'
7+
pod 'AgoraRtcEngine_iOS', '4.3.2'
88
#pod 'sdk', :path => 'sdk.podspec'
99
end
1010

@@ -23,7 +23,7 @@ target 'APIExample' do
2323
pod 'SnapKit', '~> 5.7.0'
2424

2525
# pod 'SenseLib', :path => 'sense.podspec'
26-
# pod 'bytedEffect', :path => 'bytedEffect.podspec'
26+
pod 'bytedEffect', :path => 'bytedEffect.podspec'
2727
# pod 'fuLib', :path => 'fu.podspec'
2828
end
2929

0 commit comments

Comments
 (0)