Skip to content

Commit 7ce11fd

Browse files
author
zhaoyongqiang
committed
Merge branch 'dev/4.0.1' of github.com:AgoraIO/API-Examples into dev/4.0.1
2 parents 941753e + 59e2d8d commit 7ce11fd

File tree

2 files changed

+2
-60
lines changed

2 files changed

+2
-60
lines changed

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- template: cicd/build-template/build-ios.yml
1616
parameters:
1717
displayName: 'APIExampleiOS'
18-
workingDirectory: 'iOS'
18+
workingDirectory: 'iOS/APIExample'
1919
project: 'APIExample'
2020
scheme: 'APIExample'
2121

windows/cicd/templates/build-Windows.yml

+1-59
Original file line numberDiff line numberDiff line change
@@ -27,71 +27,13 @@ jobs:
2727
value: '${{ parameters.Machine }}'
2828
- name: buildConfiguration
2929
value: 'Release'
30-
- name: WindowsRTCSDK
31-
value: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v${{ parameters.sdkVersion }}_FULL.zip'
32-
- name: Windows-ThirdParty
33-
value: 'https://github.com/AgoraIO/Advanced-Video/releases/download/Dshow/ThirdParty.zip'
34-
- name: sdkunzipPath
35-
value: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
36-
- name: MediaPlayer
37-
value: 'https://download.agora.io/sdk/release/Agora_Media_Player_for_Windows_x86_rel.v1.1.0.16486_20200507_1537.zip'
3830
steps:
3931
- script: echo "$(WindowsRTCSDK)" && ls
40-
#AgoraSDK
41-
- powershell: Windows/cicd/script/downloadsdk1.ps1 "$(WindowsRTCSDK)" "AgoraSDK.zip"
42-
#ThirdParty
43-
- powershell: Windows/cicd/script/downloadsdk1.ps1 "$(Windows-ThirdParty)" "ThirdParty.zip"
44-
#MediaPlayer
45-
- powershell: Windows/cicd/script/downloadsdk1.ps1 "$(MediaPlayer)" "MediaPlayer.zip"
32+
- script: cd ${{ parameters.workingDirectory }} && installThirdParty.bat
4633
- script: cd ${{ parameters.workingDirectory }} && ls && python ci.py
4734
env:
4835
AGORA_APP_ID: $(agora.appId)
4936

50-
- task: ExtractFiles@1
51-
inputs:
52-
archiveFilePatterns: 'AgoraSDK.zip'
53-
destinationFolder: 'AgoraSDK'
54-
55-
- task: ExtractFiles@1
56-
inputs:
57-
archiveFilePatterns: 'ThirdParty.zip'
58-
destinationFolder: 'ThirdParty'
59-
60-
- task: ExtractFiles@1
61-
inputs:
62-
archiveFilePatterns: 'MediaPlayer.zip'
63-
destinationFolder: 'MediaPlayer'
64-
65-
- task: CopyFiles@2
66-
inputs:
67-
sourceFolder: 'ThirdParty/DShow'
68-
targetFolder: ${{ parameters.workingDirectory }}/ThirdParty/DShow
69-
70-
- task: CopyFiles@2
71-
inputs:
72-
sourceFolder: 'ThirdParty/libyuv'
73-
targetFolder: ${{ parameters.workingDirectory }}/ThirdParty/libyuv
74-
75-
- task: CopyFiles@2
76-
inputs:
77-
sourceFolder: 'MediaPlayer/Agora_Media_Player_for_Windows_x86_rel.v1.1.0.16486_20200507_1537/sdk/include'
78-
targetFolder: ${{ parameters.workingDirectory }}/MediaPlayerPart/include
79-
- task: CopyFiles@2
80-
inputs:
81-
sourceFolder: 'MediaPlayer/Agora_Media_Player_for_Windows_x86_rel.v1.1.0.16486_20200507_1537/sdk/lib'
82-
targetFolder: ${{ parameters.workingDirectory }}/MediaPlayerPart/lib
83-
- task: CopyFiles@2
84-
inputs:
85-
sourceFolder: 'MediaPlayer/Agora_Media_Player_for_Windows_x86_rel.v1.1.0.16486_20200507_1537/sdk/dll'
86-
targetFolder: ${{ parameters.workingDirectory }}/MediaPlayerPart/dll
87-
88-
- script: ls
89-
90-
- task: CopyFiles@2
91-
inputs:
92-
sourceFolder: $(sdkunzipPath)/libs
93-
targetFolder: ${{ parameters.workingDirectory }}/libs
94-
9537
- task: VSBuild@1
9638
inputs:
9739
solution: '$(solution)'

0 commit comments

Comments
 (0)