Skip to content

Commit 47b088d

Browse files
author
zhaoyongqiang
committed
Merge branch 'dev/4.0.1' of github.com:AgoraIO/API-Examples into dev/4.0.1
2 parents b87adeb + bbb80cd commit 47b088d

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

.github/ci/build/build_ios.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ rm -rf ./$unzip_name/samples/API-Example/APIExample-Audio
6969
mv ./$unzip_name/samples/API-Example/APIExample ./$unzip_name/samples/APIExample
7070
rm -rf ./$unzip_name/samples/API-Example
7171
mv ./$unzip_name/samples/APIExample/sdk.podspec ./$unzip_name/
72-
python3 ios_modify_podfile.py
72+
sed -i "s|pod 'sdk', :path => 'sdk.podspec'|pod 'sdk', :path => '../../sdk.podspec'|" ./$unzip_name/samples/APIExample/Podfile
73+
sed -i "s|pod 'Agora|#pod 'Agora|" ./$unzip_name/samples/APIExample/Podfile
7374
7za a -tzip result.zip -r $unzip_name
7475
cp result.zip $WORKSPACE/withAPIExample_$zip_name

.github/ci/build/build_mac.sh

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,19 @@ echo zip_name: $zip_name
5656
python3 $WORKSPACE/artifactory_utils.py --action=download_file --file=$sdk_url
5757
7za x ./$zip_name -y
5858

59-
rm -rf ./Agora_Native_SDK_for_Mac_FULL/bin
60-
rm ./Agora_Native_SDK_for_Mac_FULL/commits
61-
rm ./Agora_Native_SDK_for_Mac_FULL/package_size_report.txt
62-
mkdir ./Agora_Native_SDK_for_Mac_FULL/samples
63-
mkdir ./Agora_Native_SDK_for_Mac_FULL/samples/API-example
64-
cp -rf ./macOS/** ./Agora_Native_SDK_for_Mac_FULL/samples/API-example
65-
7za a -tzip result.zip -r Agora_Native_SDK_for_Mac_FULL
66-
cp result.zip $WORKSPACE/withAPIExample_$zip_name
59+
unzip_name=`ls -S -d */ | grep Agora`
60+
echo unzip_name: $unzip_name
61+
62+
rm -rf ./$unzip_name/bin
63+
rm ./$unzip_name/commits
64+
rm ./$unzip_name/package_size_report.txt
65+
mkdir ./$unzip_name/samples
66+
mkdir ./$unzip_name/samples/API-Example
67+
cp -rf ./macOS/** ./$unzip_name/samples/API-Example
68+
mv ./$unzip_name/samples/API-Example/sdk.podspec ./$unzip_name/
69+
sed -i "s|pod 'sdk', :path => 'sdk.podspec'|pod 'sdk', :path => '../../sdk.podspec'|" ./$unzip_name/samples/API-Example/Podfile
70+
sed -i "s|pod 'Agora|#pod 'Agora|" ./$unzip_name/samples/API-Example/Podfile
71+
72+
7za a -tzip result.zip -r $unzip_name
73+
# 7za a -tzip result.zip -r Agora_Native_SDK_for_Mac_FULL
74+
cp result.zip $WORKSPACE/withAPIExample_$zip_name

0 commit comments

Comments
 (0)