From 031e22f616ac80beeb41f5d56a6df3f3f5f907c5 Mon Sep 17 00:00:00 2001
From: weileifrank <1138289316@qq.com>
Date: Thu, 31 Oct 2024 15:59:59 +0800
Subject: [PATCH 1/3] feat: modify ci for windows

---
 .github/ci/build/build_windows.bat | 31 ++++++++++++++++++++++--------
 windows/APIExample/install.ps1     |  2 +-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/ci/build/build_windows.bat b/.github/ci/build/build_windows.bat
index 0f02ea60c..fdcac60a7 100644
--- a/.github/ci/build/build_windows.bat
+++ b/.github/ci/build/build_windows.bat
@@ -49,8 +49,19 @@ echo build_time: %build_time%
 echo release_version: %release_version%
 echo short_version: %short_version%
 echo pwd: %cd%
-echo sdk_url: %sdk_url%
-
+echo init value sdk_url: %sdk_url%
+setlocal enabledelayedexpansion
+if "%sdk_url%"=="" (
+    REM Read sdk_url from install.ps1
+    for /f "tokens=2 delims=''" %%a in ('findstr /R "^ *\$agora_sdk = '" .\windows\APIExample\install.ps1') do (
+        set sdk_url=%%a
+        REM Remove the trailing single quote
+        set sdk_url=!sdk_url:'=!
+        REM Exit the loop after finding the first match
+        goto :FOUND
+    )
+)
+:FOUND
 echo off
 set zip_name=%sdk_url%
 :LOOP
@@ -63,14 +74,10 @@ set zip_name=%part2%
 goto LOOP
 :END
 echo on
+echo sdk_url: %sdk_url%
+echo part2: %part2%
 echo zip_name: %zip_name%
 
-dir
-
-curl %sdk_url% -o %zip_name%
-REM python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
-7z x ./%zip_name% -y
-
 dir
 rmdir /S /Q Agora_Native_SDK_for_Windows_FULL\demo
 del /F /Q Agora_Native_SDK_for_Windows_FULL\commits
@@ -90,6 +97,14 @@ del /F result.zip
 del /F %WORKSPACE%\\%zip_name%
 
 if %compile_project% EQU false goto FINAL
+curl %sdk_url% -o %zip_name%
+if %errorlevel% neq 0 (
+    echo Failed to download the file from %sdk_url%
+) else (
+REM python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
+7z x ./%zip_name% -y
 cd Agora_Native_SDK_for_Windows_FULL\samples\API-example
 call cloud_build.bat
+)
+
 :FINAL
diff --git a/windows/APIExample/install.ps1 b/windows/APIExample/install.ps1
index 7f457dcb4..5218ed440 100644
--- a/windows/APIExample/install.ps1
+++ b/windows/APIExample/install.ps1
@@ -1,6 +1,6 @@
+$agora_sdk = 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v4.5.0_FULL.zip'
 $ThirdPartysrc = 'https://fullapp.oss-cn-beijing.aliyuncs.com/API-Examples/ThirdParty.zip'
 $ThirdPartydes = 'ThirdParty.zip'
-$agora_sdk = 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v4.5.0_FULL.zip'
 $agora_des = 'AgoraSdk.zip'
 $agora_local_sdk = '../../sdk'
 

From 62a7e04f9f2bb29e72925f1da6a2eb00bed64cf4 Mon Sep 17 00:00:00 2001
From: weileifrank <1138289316@qq.com>
Date: Thu, 31 Oct 2024 19:06:46 +0800
Subject: [PATCH 2/3] feat: modify ci for windows

---
 .github/ci/build/build_windows.bat | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/ci/build/build_windows.bat b/.github/ci/build/build_windows.bat
index fdcac60a7..6cad76781 100644
--- a/.github/ci/build/build_windows.bat
+++ b/.github/ci/build/build_windows.bat
@@ -78,10 +78,18 @@ echo sdk_url: %sdk_url%
 echo part2: %part2%
 echo zip_name: %zip_name%
 
-dir
-rmdir /S /Q Agora_Native_SDK_for_Windows_FULL\demo
-del /F /Q Agora_Native_SDK_for_Windows_FULL\commits
-del /F /Q Agora_Native_SDK_for_Windows_FULL\package_size_report.txt
+if %compile_project% EQU false goto FINAL
+curl %sdk_url% -o %zip_name%
+if %errorlevel% neq 0 (
+    echo Failed to download the file from %sdk_url%
+) else (
+    echo Successfully downloaded the file from %sdk_url%
+    dir
+    rmdir /S /Q Agora_Native_SDK_for_Windows_FULL\demo
+    del /F /Q Agora_Native_SDK_for_Windows_FULL\commits
+    del /F /Q Agora_Native_SDK_for_Windows_FULL\package_size_report.txt
+)
+
 mkdir Agora_Native_SDK_for_Windows_FULL\samples
 mkdir Agora_Native_SDK_for_Windows_FULL\samples\API-example
 rmdir /S /Q windows\cicd
@@ -97,14 +105,6 @@ del /F result.zip
 del /F %WORKSPACE%\\%zip_name%
 
 if %compile_project% EQU false goto FINAL
-curl %sdk_url% -o %zip_name%
-if %errorlevel% neq 0 (
-    echo Failed to download the file from %sdk_url%
-) else (
-REM python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
-7z x ./%zip_name% -y
 cd Agora_Native_SDK_for_Windows_FULL\samples\API-example
 call cloud_build.bat
-)
-
 :FINAL

From 0079129cfae1d83256642217cd9c91200b204f4e Mon Sep 17 00:00:00 2001
From: weileifrank <1138289316@qq.com>
Date: Thu, 31 Oct 2024 19:19:01 +0800
Subject: [PATCH 3/3] feat: modify ci for windows2

---
 .github/ci/build/build_windows.bat | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/ci/build/build_windows.bat b/.github/ci/build/build_windows.bat
index 6cad76781..0dddf9238 100644
--- a/.github/ci/build/build_windows.bat
+++ b/.github/ci/build/build_windows.bat
@@ -78,7 +78,6 @@ echo sdk_url: %sdk_url%
 echo part2: %part2%
 echo zip_name: %zip_name%
 
-if %compile_project% EQU false goto FINAL
 curl %sdk_url% -o %zip_name%
 if %errorlevel% neq 0 (
     echo Failed to download the file from %sdk_url%