Skip to content

Commit 534eb8e

Browse files
bghgarybghgary
committed
Undo temporary changes
1 parent f77b882 commit 534eb8e

File tree

5 files changed

+140
-144
lines changed

5 files changed

+140
-144
lines changed

‎.github/jobs/test_install_ios.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ parameters:
55

66
jobs:
77
- job: ${{parameters.name}}
8-
#condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
9-
timeoutInMinutes: 60
8+
timeoutInMinutes: 20
109
pool:
1110
vmImage: ${{parameters.vmImage}}
1211

‎.github/jobs/test_install_linux.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ parameters:
66

77
jobs:
88
- job: ${{parameters.name}}
9-
#condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
10-
timeoutInMinutes: 30
9+
timeoutInMinutes: 20
1110
pool:
1211
vmImage: ${{parameters.vmImage}}
1312

‎.github/jobs/test_install_macos.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ parameters:
44

55
jobs:
66
- job: ${{parameters.name}}
7-
#condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
8-
timeoutInMinutes: 30
7+
timeoutInMinutes: 20
98
pool:
109
vmImage: ${{parameters.vmImage}}
1110

‎.github/jobs/test_install_win32.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ parameters:
99

1010
jobs:
1111
- job: ${{parameters.name}}
12-
#condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
13-
timeoutInMinutes: 20
12+
timeoutInMinutes: 30
1413
pool:
1514
vmImage: ${{parameters.vmImage}}
1615

‎azure-pipelines.yml‎

Lines changed: 136 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -15,142 +15,142 @@ variables:
1515
value: 16.4
1616

1717
jobs:
18-
# # Apple
19-
# - template: .github/jobs/macos.yml
20-
# parameters:
21-
# name: MacOS
22-
# vmImage: "macOS-latest"
23-
24-
# - template: .github/jobs/macos.yml
25-
# parameters:
26-
# name: MacOS_Sanitizers
27-
# vmImage: "macOS-latest"
28-
# enableSanitizers: true
29-
30-
# - template: .github/jobs/ios.yml
31-
# parameters:
32-
# name: iOS_iOS180
33-
# vmImage: "macOS-latest"
34-
# deploymentTarget: 18.0
35-
36-
# - template: .github/jobs/ios.yml
37-
# parameters:
38-
# name: iOS_iOS175
39-
# vmImage: "macOS-latest"
40-
# deploymentTarget: 17.5
41-
42-
# # Win32
43-
# - template: .github/jobs/win32.yml
44-
# parameters:
45-
# name: Win32_x64_D3D11
46-
# vmImage: "windows-latest"
47-
# platform: x64
48-
49-
# - template: .github/jobs/win32.yml
50-
# parameters:
51-
# name: Win32_x64_JSI_D3D11
52-
# vmImage: "windows-latest"
53-
# platform: x64
54-
# napiType: jsi
55-
56-
# - template: .github/jobs/win32.yml
57-
# parameters:
58-
# name: Win32_x64_V8_D3D11
59-
# vmImage: "windows-latest"
60-
# platform: x64
61-
# napiType: V8
62-
63-
# - template: .github/jobs/win32.yml
64-
# parameters:
65-
# name: Win32_x64_D3D12
66-
# vmImage: "windows-latest"
67-
# platform: x64
68-
# graphics_api: D3D12
69-
70-
# - template: .github/jobs/win32.yml
71-
# parameters:
72-
# name: Win32_x64_D3D12_Sanitizers
73-
# vmImage: "windows-latest"
74-
# platform: x64
75-
# graphics_api: D3D12
76-
# enableSanitizers: true
77-
78-
# # UWP
79-
# - template: .github/jobs/uwp.yml
80-
# parameters:
81-
# name: UWP_x64
82-
# vmImage: "windows-latest"
83-
# platform: x64
84-
85-
# - template: .github/jobs/uwp.yml
86-
# parameters:
87-
# name: UWP_arm64
88-
# vmImage: "windows-latest"
89-
# platform: arm64
90-
91-
# - template: .github/jobs/uwp.yml
92-
# parameters:
93-
# name: UWP_arm64_JSI
94-
# vmImage: "windows-latest"
95-
# platform: arm64
96-
# napiType: jsi
97-
98-
# # Ubuntu/Linux
99-
100-
# # TODO: v8 is incompatible with curl for some reason
101-
# # See https://github.com/BabylonJS/BabylonNative/issues/1190
102-
103-
# - template: .github/jobs/linux.yml
104-
# parameters:
105-
# name: Ubuntu_Clang_JSC
106-
# vmImage: "ubuntu-latest"
107-
# CC: clang
108-
# CXX: clang++
109-
# JSEngine: JavaScriptCore
110-
111-
# - template: .github/jobs/linux.yml
112-
# parameters:
113-
# name: Ubuntu_GCC_JSC
114-
# vmImage: "ubuntu-latest"
115-
# CC: gcc
116-
# CXX: g++
117-
# JSEngine: JavaScriptCore
118-
119-
# # Memory leaks on CI is disabled due to memory leaks reported with xvfb and impossible to add to ignore list.
120-
# # See https://github.com/BabylonJS/BabylonNative/issues/1575
121-
# # - template: .github/jobs/linux.yml
122-
# # parameters:
123-
# # name: Ubuntu_Clang_JavaScriptCore_Sanitizers
124-
# # vmImage: 'ubuntu-latest'
125-
# # CC: clang
126-
# # CXX: clang++
127-
# # JSEngine: JavaScriptCore
128-
# # enableSanitizers: true
129-
130-
# # Android
131-
# - template: .github/jobs/android.yml
132-
# parameters:
133-
# name: Android_Ubuntu_JSC
134-
# vmImage: "ubuntu-latest"
135-
# JSEngine: JavaScriptCore
136-
137-
# - template: .github/jobs/android.yml
138-
# parameters:
139-
# name: Android_Ubuntu_V8
140-
# vmImage: "ubuntu-latest"
141-
# JSEngine: V8
142-
143-
# - template: .github/jobs/android.yml
144-
# parameters:
145-
# name: Android_MacOS_JSC
146-
# vmImage: "macOS-latest"
147-
# JSEngine: JavaScriptCore
148-
149-
# - template: .github/jobs/android.yml
150-
# parameters:
151-
# name: Android_MacOS_V8
152-
# vmImage: "macOS-latest"
153-
# JSEngine: V8
18+
# Apple
19+
- template: .github/jobs/macos.yml
20+
parameters:
21+
name: MacOS
22+
vmImage: "macOS-latest"
23+
24+
- template: .github/jobs/macos.yml
25+
parameters:
26+
name: MacOS_Sanitizers
27+
vmImage: "macOS-latest"
28+
enableSanitizers: true
29+
30+
- template: .github/jobs/ios.yml
31+
parameters:
32+
name: iOS_iOS180
33+
vmImage: "macOS-latest"
34+
deploymentTarget: 18.0
35+
36+
- template: .github/jobs/ios.yml
37+
parameters:
38+
name: iOS_iOS175
39+
vmImage: "macOS-latest"
40+
deploymentTarget: 17.5
41+
42+
# Win32
43+
- template: .github/jobs/win32.yml
44+
parameters:
45+
name: Win32_x64_D3D11
46+
vmImage: "windows-latest"
47+
platform: x64
48+
49+
- template: .github/jobs/win32.yml
50+
parameters:
51+
name: Win32_x64_JSI_D3D11
52+
vmImage: "windows-latest"
53+
platform: x64
54+
napiType: jsi
55+
56+
- template: .github/jobs/win32.yml
57+
parameters:
58+
name: Win32_x64_V8_D3D11
59+
vmImage: "windows-latest"
60+
platform: x64
61+
napiType: V8
62+
63+
- template: .github/jobs/win32.yml
64+
parameters:
65+
name: Win32_x64_D3D12
66+
vmImage: "windows-latest"
67+
platform: x64
68+
graphics_api: D3D12
69+
70+
- template: .github/jobs/win32.yml
71+
parameters:
72+
name: Win32_x64_D3D12_Sanitizers
73+
vmImage: "windows-latest"
74+
platform: x64
75+
graphics_api: D3D12
76+
enableSanitizers: true
77+
78+
# UWP
79+
- template: .github/jobs/uwp.yml
80+
parameters:
81+
name: UWP_x64
82+
vmImage: "windows-latest"
83+
platform: x64
84+
85+
- template: .github/jobs/uwp.yml
86+
parameters:
87+
name: UWP_arm64
88+
vmImage: "windows-latest"
89+
platform: arm64
90+
91+
- template: .github/jobs/uwp.yml
92+
parameters:
93+
name: UWP_arm64_JSI
94+
vmImage: "windows-latest"
95+
platform: arm64
96+
napiType: jsi
97+
98+
# Ubuntu/Linux
99+
100+
# TODO: v8 is incompatible with curl for some reason
101+
# See https://github.com/BabylonJS/BabylonNative/issues/1190
102+
103+
- template: .github/jobs/linux.yml
104+
parameters:
105+
name: Ubuntu_Clang_JSC
106+
vmImage: "ubuntu-latest"
107+
CC: clang
108+
CXX: clang++
109+
JSEngine: JavaScriptCore
110+
111+
- template: .github/jobs/linux.yml
112+
parameters:
113+
name: Ubuntu_GCC_JSC
114+
vmImage: "ubuntu-latest"
115+
CC: gcc
116+
CXX: g++
117+
JSEngine: JavaScriptCore
118+
119+
# Memory leaks on CI is disabled due to memory leaks reported with xvfb and impossible to add to ignore list.
120+
# See https://github.com/BabylonJS/BabylonNative/issues/1575
121+
# - template: .github/jobs/linux.yml
122+
# parameters:
123+
# name: Ubuntu_Clang_JavaScriptCore_Sanitizers
124+
# vmImage: 'ubuntu-latest'
125+
# CC: clang
126+
# CXX: clang++
127+
# JSEngine: JavaScriptCore
128+
# enableSanitizers: true
129+
130+
# Android
131+
- template: .github/jobs/android.yml
132+
parameters:
133+
name: Android_Ubuntu_JSC
134+
vmImage: "ubuntu-latest"
135+
JSEngine: JavaScriptCore
136+
137+
- template: .github/jobs/android.yml
138+
parameters:
139+
name: Android_Ubuntu_V8
140+
vmImage: "ubuntu-latest"
141+
JSEngine: V8
142+
143+
- template: .github/jobs/android.yml
144+
parameters:
145+
name: Android_MacOS_JSC
146+
vmImage: "macOS-latest"
147+
JSEngine: JavaScriptCore
148+
149+
- template: .github/jobs/android.yml
150+
parameters:
151+
name: Android_MacOS_V8
152+
vmImage: "macOS-latest"
153+
JSEngine: V8
154154

155155
# Installation tests
156156
- template: .github/jobs/test_install_ios.yml

0 commit comments

Comments
 (0)