File tree Expand file tree Collapse file tree 8 files changed +15
-9
lines changed
Expand file tree Collapse file tree 8 files changed +15
-9
lines changed Original file line number Diff line number Diff line change 223223 else
224224 echo " Warning: Branch name does not match dev/x.x.x format!"
225225 echo " Current branch: $BRANCH_NAME "
226- echo " Expected format: dev/x.x.x (e.g., dev/4.5.3 )"
226+ echo " Expected format: dev/x.x.x (e.g., dev/4.6.2 )"
227227 echo " Skipping version validation for non-version branches..."
228228 BRANCH_VERSION=" "
229229 fi
Original file line number Diff line number Diff line change 218218 else
219219 echo " Warning: Branch name does not match dev/x.x.x format!"
220220 echo " Current branch: $BRANCH_NAME "
221- echo " Expected format: dev/x.x.x (e.g., dev/4.5.3 )"
221+ echo " Expected format: dev/x.x.x (e.g., dev/4.6.2 )"
222222 echo " Skipping version validation for non-version branches..."
223223 BRANCH_VERSION=" "
224224 fi
Original file line number Diff line number Diff line change @@ -49,12 +49,18 @@ echo sdk_url: %sdk_url%
4949
5050REM Version validation: branch name vs install.ps1 SDK version
5151for /f " tokens=*" %%a in ('powershell -Command " (Get-Content 'windows\APIExample\install.ps1' -Raw) -match '_v([0-9]+\.[0-9]+\.[0-9]+)' | Out-Null; $matches[1]" ') do set SDK_VER = %%a
52+ set " BRANCH_STRIP = %api_examples_branch:origin/ =% "
53+ if " %BRANCH_STRIP% " == " main" (
54+ echo Branch is main, skipping version validation ^ (main branch is trusted^ )
55+ goto :skip_version_validation
56+ )
5257for /f " tokens=*" %%b in ('powershell -Command " '%api_examples_branch% ' -match '([0-9]+\.[0-9]+\.[0-9]+)' | Out-Null; $matches[1]" ') do set BRANCH_VER = %%b
5358if not " %SDK_VER% " == " %BRANCH_VER% " (
5459 echo ERROR: Version mismatch - Branch: %BRANCH_VER% , install.ps1: %SDK_VER%
5560 exit /b 1
5661)
5762echo Version validated: %BRANCH_VER%
63+ :skip_version_validation
5864
5965REM If sdk_url has a value, replace the URL in install.ps1
6066if not " %sdk_url% " == " " (
Original file line number Diff line number Diff line change 26242624 "$(inherited)",
26252625 "@executable_path/Frameworks",
26262626 );
2627- MARKETING_VERSION = 4.5.3 ;
2627+ MARKETING_VERSION = 4.6.2 ;
26282628 OTHER_LDFLAGS = (
26292629 "$(inherited)",
26302630 "-ObjC",
26952695 "$(inherited)",
26962696 "@executable_path/Frameworks",
26972697 );
2698- MARKETING_VERSION = 4.5.3 ;
2698+ MARKETING_VERSION = 4.6.2 ;
26992699 OTHER_LDFLAGS = (
27002700 "$(inherited)",
27012701 "-ObjC",
Original file line number Diff line number Diff line change 44#source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
55
66def common_pods
7- pod 'AgoraRtcEngine_iOS' , '4.5.3 '
7+ pod 'AgoraRtcEngine_iOS' , '4.6.2 '
88 # pod 'sdk', :path => 'sdk.podspec'
99end
1010
Original file line number Diff line number Diff line change 18371837 "$(inherited)",
18381838 "@executable_path/../Frameworks",
18391839 );
1840- MARKETING_VERSION = 4.5.3 ;
1840+ MARKETING_VERSION = 4.6.2 ;
18411841 PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.examples;
18421842 PRODUCT_NAME = "$(TARGET_NAME)";
18431843 PROVISIONING_PROFILE_SPECIFIER = "";
18691869 "$(inherited)",
18701870 "@executable_path/../Frameworks",
18711871 );
1872- MARKETING_VERSION = 4.5.3 ;
1872+ MARKETING_VERSION = 4.6.2 ;
18731873 PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.examples;
18741874 PRODUCT_NAME = "$(TARGET_NAME)";
18751875 PROVISIONING_PROFILE_SPECIFIER = "";
Original file line number Diff line number Diff line change 22
33
44def common_pods
5- pod 'AgoraRtcEngine_macOS' , '4.5.3 '
5+ pod 'AgoraRtcEngine_macOS' , '4.6.2 '
66 # pod 'sdk', :path => 'sdk.podspec'
77end
88
Original file line number Diff line number Diff line change 1- $agora_sdk = ' https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v4.5.3_FULL .zip'
1+ $agora_sdk = ' https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v4.6.2_FULL .zip'
22$ThirdPartysrc = ' https://demo-app-download.agora.io/api_example/ThirdParty.zip'
33$ThirdPartydes = ' ThirdParty.zip'
44$agora_des = ' AgoraSdk.zip'
You can’t perform that action at this time.
0 commit comments