From 373fa38bbbaf8af439c8a07d2e31bcff9fe677ae Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Fri, 15 Nov 2024 15:22:47 +0800 Subject: [PATCH 1/4] echo files --- .github/ci/build/build_ios.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 36a48a0da..1b4f67909 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -80,18 +80,19 @@ else mv ./$unzip_name/samples/${ios_direction}/sdk.podspec ./$unzip_name/ || exit 1 fi -echo "work space1: $WORKSPACE" -python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 +echo "Current directory files:" +ls -la +# python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 -echo "start compress" -7za a -tzip result.zip -r $unzip_name > log.txt -echo "start move to" -echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name -mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name +# echo "start compress" +# 7za a -tzip result.zip -r $unzip_name > log.txt +# 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 [ $compile_project = true ]; then - cd ./$unzip_name/samples/${ios_direction} - ./cloud_build.sh || exit 1 - cd - -fi +# if [ $compile_project = true ]; then +# cd ./$unzip_name/samples/${ios_direction} +# ./cloud_build.sh || exit 1 +# cd - +# fi From 3944dddc289df90c6fe7964677f6d8dd16cd1305 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Fri, 15 Nov 2024 15:33:05 +0800 Subject: [PATCH 2/4] Delete the file --- .github/ci/build/build_ios.sh | 5 +++++ .github/ci/build/build_mac.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 1b4f67909..8f520b6d1 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -74,6 +74,11 @@ else rm -rf ./$unzip_name/bin rm ./$unzip_name/commits rm ./$unzip_name/package_size_report.txt + + rm ./$unzip_name/.commits + rm ./$unzip_name/AgoraInfra_iOS.swift + rm ./$unzip_name/AgoraRtcEngine_iOS.podspec + rm ./$unzip_name/Package.swift mkdir -p ./$unzip_name/samples cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/${ios_direction} || exit 1 ls -al ./$unzip_name/samples/${ios_direction}/ diff --git a/.github/ci/build/build_mac.sh b/.github/ci/build/build_mac.sh index a9c0fa1ee..5469dd2a9 100644 --- a/.github/ci/build/build_mac.sh +++ b/.github/ci/build/build_mac.sh @@ -75,6 +75,11 @@ else rm -rf ./$unzip_name/bin rm ./$unzip_name/commits rm ./$unzip_name/package_size_report.txt + rm ./$unzip_name/.commits + rm ./$unzip_name/AgoraInfra_iOS.swift + rm ./$unzip_name/AgoraRtcEngine_iOS.podspec + rm ./$unzip_name/Package.swift + mkdir ./$unzip_name/samples cp -rf ./macOS ./$unzip_name/samples/APIExample || exit 1 ls -al ./$unzip_name/samples/API-Example/ From ef46ddb68f8a978477940889b43368dd5e429f25 Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Fri, 15 Nov 2024 15:37:17 +0800 Subject: [PATCH 3/4] Modify script --- .github/ci/build/build_ios.sh | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/ci/build/build_ios.sh b/.github/ci/build/build_ios.sh index 8f520b6d1..c3ce9c7a9 100644 --- a/.github/ci/build/build_ios.sh +++ b/.github/ci/build/build_ios.sh @@ -85,19 +85,17 @@ else mv ./$unzip_name/samples/${ios_direction}/sdk.podspec ./$unzip_name/ || exit 1 fi -echo "Current directory files:" -ls -la -# python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 +python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1 -# echo "start compress" -# 7za a -tzip result.zip -r $unzip_name > log.txt -# echo "start move to" -# echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name -# mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name +echo "start compress" +7za a -tzip result.zip -r $unzip_name > log.txt +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 [ $compile_project = true ]; then -# cd ./$unzip_name/samples/${ios_direction} -# ./cloud_build.sh || exit 1 -# cd - -# fi +if [ $compile_project = true ]; then + cd ./$unzip_name/samples/${ios_direction} + ./cloud_build.sh || exit 1 + cd - +fi From 50caa689cde369b0870670aa70bd55dd15ea8def Mon Sep 17 00:00:00 2001 From: qinhui <> Date: Fri, 15 Nov 2024 15:51:03 +0800 Subject: [PATCH 4/4] modify script --- .github/ci/build/build_mac.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ci/build/build_mac.sh b/.github/ci/build/build_mac.sh index 5469dd2a9..9d17566d5 100644 --- a/.github/ci/build/build_mac.sh +++ b/.github/ci/build/build_mac.sh @@ -76,8 +76,8 @@ else rm ./$unzip_name/commits rm ./$unzip_name/package_size_report.txt rm ./$unzip_name/.commits - rm ./$unzip_name/AgoraInfra_iOS.swift - rm ./$unzip_name/AgoraRtcEngine_iOS.podspec + rm ./$unzip_name/AgoraInfra_macOS.swift + rm ./$unzip_name/AgoraRtcEngine_macOS.podspec rm ./$unzip_name/Package.swift mkdir ./$unzip_name/samples