Skip to content

Commit 6367b1b

Browse files
author
qinhui
committed
Modify the script and add SDK link empty judgment
1 parent 9bef28d commit 6367b1b

2 files changed

Lines changed: 29 additions & 20 deletions

File tree

.github/ci/build/build_ios.sh

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,32 @@ echo short_version: $short_version
5353
echo pwd: `pwd`
5454
echo sdk_url: $sdk_url
5555

56-
zip_name=${sdk_url##*/}
57-
echo zip_name: $zip_name
58-
59-
curl -o $zip_name $sdk_url || exit 1
60-
7za x ./$zip_name -y > log.txt
61-
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
56+
unzip_name=Agora_Native_SDK_for_iOS_FULL
57+
sdk_url_flag=false
58+
if [ -z "$sdk_url" ]; then
59+
sdk_url_flag=false
60+
echo "sdk_url is empty"
61+
echo unzip_name: $unzip_name
62+
else
63+
sdk_url_flag=true
64+
zip_name=${sdk_url##*/}
65+
echo zip_name: $zip_name
66+
curl -o $zip_name $sdk_url || exit 1
67+
7za x ./$zip_name -y > log.txt
68+
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
69+
echo unzip_name: $unzip_name
70+
rm -rf ./$unzip_name/bin
71+
rm ./$unzip_name/commits
72+
rm ./$unzip_name/package_size_report.txt
73+
fi
6974

75+
mkdir -p ./$unzip_name/samples
7076
cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/API-Example || exit 1
7177
ls -al ./$unzip_name/samples/API-Example/
7278
mv ./$unzip_name/samples/API-Example/sdk.podspec ./$unzip_name/ || exit 1
7379

7480
echo "work space1: $WORKSPACE"
75-
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/API-Example/Podfile || exit 1
76-
81+
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/API-Example/Podfile $sdk_url_flag || exit 1
7782

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

.github/ci/build/modify_podfile.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import os, sys
22

3-
def modfiy(path):
3+
def modfiy(path, sdk_flag):
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_flag:
9+
line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
910
elif "pod 'sdk" in line:
10-
line = ""
11+
if sdk_flag:
12+
line = ""
1113
elif 'sh .download_script' in line:
1214
line = line.replace('true', 'false') + "\n"
1315
contents.append(line)
@@ -19,6 +21,8 @@ def modfiy(path):
1921
fw.close()
2022

2123

24+
2225
if __name__ == '__main__':
23-
path = sys.argv[1:][0]
24-
modfiy(path.strip())
26+
path = sys.argv[1]
27+
sdk_url_is_not_empty = sys.argv[2].lower() == 'true'
28+
modfiy(path.strip(), sdk_url_is_not_empty)

0 commit comments

Comments
 (0)