Skip to content

Commit 9c69a24

Browse files
authored
Fix CI after Ubuntu updated from 20.04 to 22.04 (#1191)
- Update Linux to use latest Clang/GCC compilers - Use JavaScriptCore instead of V8 to work around #1190
1 parent 5990087 commit 9c69a24

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

.github/jobs/linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ parameters:
44
CC: ''
55
CXX: ''
66
JSEngine: ''
7-
7+
88
jobs:
99
- job: ${{ parameters.name }}
1010
timeoutInMinutes: 30
1111
pool:
1212
vmImage: ${{ parameters.vmImage }}
13-
13+
1414
variables:
1515
CC: ${{ parameters.CC }}
1616
CXX: ${{ parameters.CXX }}
@@ -32,7 +32,7 @@ jobs:
3232

3333
- script: |
3434
sudo apt-get update
35-
sudo apt-get install libjavascriptcoregtk-4.0-dev libgl1-mesa-dev libcurl4-openssl-dev ${{ parameters.CC }} libc++-9-dev libc++abi-9-dev libnode-dev
35+
sudo apt-get install libjavascriptcoregtk-4.0-dev libgl1-mesa-dev libcurl4-openssl-dev
3636
displayName: 'Install packages'
3737
3838
- script: |

azure-pipelines.yml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,37 +88,25 @@ jobs:
8888
napiType: jsi
8989

9090
# Ubuntu/Linux
91-
- template: .github/jobs/linux.yml
92-
parameters:
93-
name: Ubuntu_Clang9_V8
94-
vmImage: 'ubuntu-latest'
95-
CC: clang-9
96-
CXX: clang++-9
97-
JSEngine: V8
9891

99-
- template: .github/jobs/linux.yml
100-
parameters:
101-
name: Ubuntu_GCC9_JSC
102-
vmImage: 'ubuntu-latest'
103-
CC: gcc-9
104-
CXX: g++-9
105-
JSEngine: JavaScriptCore
92+
# TODO: v8 is incompatible with curl for some reason
93+
# See https://github.com/BabylonJS/BabylonNative/issues/1190
10694

10795
- template: .github/jobs/linux.yml
10896
parameters:
109-
name: Ubuntu_GCC9_V8
97+
name: Ubuntu_Clang_JavaScriptCore
11098
vmImage: 'ubuntu-latest'
111-
CC: gcc-9
112-
CXX: g++-9
113-
JSEngine: V8
99+
CC: clang
100+
CXX: clang++
101+
JSEngine: JavaScriptCore
114102

115103
- template: .github/jobs/linux.yml
116104
parameters:
117-
name: Ubuntu_GCC10_V8
105+
name: Ubuntu_GCC_JavaScriptCore
118106
vmImage: 'ubuntu-latest'
119-
CC: gcc-10
120-
CXX: g++-10
121-
JSEngine: V8
107+
CC: gcc
108+
CXX: g++
109+
JSEngine: JavaScriptCore
122110

123111
# Android
124112
- template: .github/jobs/android.yml

0 commit comments

Comments
 (0)