Skip to content

Commit 0b2d402

Browse files
bghgarybghgary
authored
Format yml files with prettier (#1581)
1 parent d6c5fc4 commit 0b2d402

File tree

14 files changed

+455
-459
lines changed

14 files changed

+455
-459
lines changed

‎.github/jobs/android.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
parameters:
2-
name: ''
3-
vmImage: ''
4-
JSEngine: ''
5-
macOSCodename: ''
2+
name: ""
3+
vmImage: ""
4+
JSEngine: ""
5+
macOSCodename: ""
66

77
jobs:
8-
- job: ${{ parameters.name }}
8+
- job: ${{parameters.name}}
99
timeoutInMinutes: 45
1010
pool:
11-
vmImage: ${{ parameters.vmImage }}
11+
vmImage: ${{parameters.vmImage}}
1212

1313
variables:
14-
SANITIZER_FLAG: ${{ coalesce(replace(format('{0}', parameters.Sanitizers), 'True', 'ON'), 'OFF') }}
14+
SANITIZER_FLAG: ${{coalesce(replace(format('{0}', parameters.Sanitizers), 'True', 'ON'), 'OFF')}}
1515

1616
steps:
17-
- template: cmake.yml
18-
parameters:
19-
vmImage: ${{ parameters.vmImage }}
17+
- template: cmake.yml
18+
parameters:
19+
vmImage: ${{parameters.vmImage}}
2020

21-
- task: JavaToolInstaller@0
22-
inputs:
23-
versionSpec: '17'
24-
jdkArchitectureOption: 'x64'
25-
jdkSourceOption: 'PreInstalled'
21+
- task: JavaToolInstaller@0
22+
inputs:
23+
versionSpec: "17"
24+
jdkArchitectureOption: "x64"
25+
jdkSourceOption: "PreInstalled"
2626

27-
- task: Gradle@3
28-
inputs:
29-
workingDirectory: 'Apps/Playground/Android'
30-
gradleWrapperFile: 'Apps/Playground/Android/gradlew'
31-
gradleOptions: '-Xmx1536m'
32-
options: '-PJSEngine=${{ parameters.JSEngine }} -PARM64Only -PNDK_VERSION=$(NDK_VERSION) -PSANITIZERS=$(SANITIZER_FLAG)'
27+
- task: Gradle@3
28+
inputs:
29+
workingDirectory: "Apps/Playground/Android"
30+
gradleWrapperFile: "Apps/Playground/Android/gradlew"
31+
gradleOptions: "-Xmx1536m"
32+
options: "-PJSEngine=${{parameters.JSEngine}} -PARM64Only -PNDK_VERSION=$(NDK_VERSION) -PSANITIZERS=$(SANITIZER_FLAG)"
3333
publishJUnitResults: false
34-
tasks: 'assembleRelease'
35-
displayName: 'Build Playground ${{ parameters.JSEngine }}'
34+
tasks: "assembleRelease"
35+
displayName: "Build Playground ${{parameters.JSEngine}}"

‎.github/jobs/android_tests.yml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
parameters:
2-
name: ''
3-
vmImage: ''
4-
JSEngine: ''
5-
macOSCodename: ''
2+
name: ""
3+
vmImage: ""
4+
JSEngine: ""
5+
macOSCodename: ""
66

77
jobs:
8-
- job: ${{ parameters.name }}
8+
- job: ${{parameters.name}}
99
timeoutInMinutes: 45
1010
pool:
11-
vmImage: ${{ parameters.vmImage }}
11+
vmImage: ${{parameters.vmImage}}
1212

1313
steps:
14-
- template: cmake.yml
15-
parameters:
16-
vmImage: ${{ parameters.vmImage }}
14+
- template: cmake.yml
15+
parameters:
16+
vmImage: ${{parameters.vmImage}}
1717

18-
- script: |
19-
echo Install Android image
20-
echo 'y' | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-27;default;x86_64'
21-
echo 'y' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
22-
echo Create AVD
23-
$ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_API_27 -d pixel -k 'system-images;android-27;default;x86_64'
24-
displayName: 'Install Android Emulator'
25-
- script: |
26-
echo Start emulator
27-
nohup $ANDROID_HOME/emulator/emulator -avd Pixel_API_27 -gpu host -no-window 2>&1 &
28-
echo Wait for emulator
29-
$ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do echo '.'; sleep 1; done'
30-
$ANDROID_HOME/platform-tools/adb devices
31-
displayName: 'Start Android Emulator'
18+
- script: |
19+
echo Install Android image
20+
echo 'y' | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-27;default;x86_64'
21+
echo 'y' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
22+
echo Create AVD
23+
$ANDROID_HOME/tools/bin/avdmanager create avd -n Pixel_API_27 -d pixel -k 'system-images;android-27;default;x86_64'
24+
displayName: "Install Android Emulator"
25+
- script: |
26+
echo Start emulator
27+
nohup $ANDROID_HOME/emulator/emulator -avd Pixel_API_27 -gpu host -no-window 2>&1 &
28+
echo Wait for emulator
29+
$ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do echo '.'; sleep 1; done'
30+
$ANDROID_HOME/platform-tools/adb devices
31+
displayName: "Start Android Emulator"
3232
33-
- task: Gradle@3
34-
inputs:
35-
gradleWrapperFile: 'Apps/UnitTests/Android/gradlew'
36-
workingDirectory: 'Apps/UnitTests/Android'
37-
options: '-PabiFilters=x86_64 -PjsEngine=${{parameters.jsEngine}}'
38-
tasks: 'connectedAndroidTest'
39-
jdkVersionOption: 1.11
40-
displayName: 'Run Connected Android Test'
33+
- task: Gradle@3
34+
inputs:
35+
gradleWrapperFile: "Apps/UnitTests/Android/gradlew"
36+
workingDirectory: "Apps/UnitTests/Android"
37+
options: "-PabiFilters=x86_64 -PjsEngine=${{parameters.jsEngine}}"
38+
tasks: "connectedAndroidTest"
39+
jdkVersionOption: 1.11
40+
displayName: "Run Connected Android Test"
4141

42-
- script: |
43-
export results=$(find ./app/build/outputs/androidTest-results -name "*.txt")
44-
echo cat "$results"
45-
cat "$results"
46-
workingDirectory: 'Apps/UnitTests/Android'
47-
condition: succeededOrFailed()
48-
displayName: 'Dump logcat from Test Results'
42+
- script: |
43+
export results=$(find ./app/build/outputs/androidTest-results -name "*.txt")
44+
echo cat "$results"
45+
cat "$results"
46+
workingDirectory: "Apps/UnitTests/Android"
47+
condition: succeededOrFailed()
48+
displayName: "Dump logcat from Test Results"
4949
50-
- task: PublishBuildArtifacts@1
51-
inputs:
52-
pathToPublish: 'Apps/UnitTests/Android/app/build/outputs/androidTest-results/connected'
53-
artifactName: 'AndroidTestResults_${{parameters.jsEngine}}'
54-
condition: succeededOrFailed()
55-
displayName: 'Publish Test Results'
50+
- task: PublishBuildArtifacts@1
51+
inputs:
52+
pathToPublish: "Apps/UnitTests/Android/app/build/outputs/androidTest-results/connected"
53+
artifactName: "AndroidTestResults_${{parameters.jsEngine}}"
54+
condition: succeededOrFailed()
55+
displayName: "Publish Test Results"

‎.github/jobs/cmake.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
parameters:
2-
vmImage: ''
2+
vmImage: ""
33

44
# Force using older cmake See https://gitlab.kitware.com/cmake/cmake/-/issues/22021
5-
# On Mac, Bintray end of service makes the use of Homebrew to be difficult.
5+
# On Mac, Bintray end of service makes the use of Homebrew to be difficult.
66
# Using direct download instead to not be dependant on a 3rd party service.
77

88
steps:
@@ -16,8 +16,8 @@ steps:
1616
unzip ninja-mac.zip
1717
sudo cp -v ninja /usr/local/bin
1818
cmake --version
19-
displayName: 'CMake version'
20-
condition: contains('${{ parameters.vmImage }}', 'macOS')
19+
displayName: "CMake version"
20+
condition: contains('${{parameters.vmImage}}', 'macOS')
2121
2222
- script: |
2323
wget https://github.com/Kitware/CMake/releases/download/v$(CMAKE_VERSION)/cmake-$(CMAKE_VERSION)-Linux-x86_64.sh
@@ -28,10 +28,10 @@ steps:
2828
sudo apt-get update
2929
sudo apt-get install ninja-build
3030
cmake --version
31-
condition: contains('${{ parameters.vmImage }}', 'ubuntu')
32-
displayName: 'CMake version'
31+
condition: contains('${{parameters.vmImage}}', 'ubuntu')
32+
displayName: "CMake version"
3333
3434
- powershell: |
3535
choco install cmake --version=$(CMAKE_VERSION) -y --allow-downgrade
36-
condition: contains('${{ parameters.vmImage }}', 'windows')
37-
displayName: 'CMake version'
36+
condition: contains('${{parameters.vmImage}}', 'windows')
37+
displayName: "CMake version"

‎.github/jobs/ios.yml‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
parameters:
2-
name: ''
3-
vmImage: ''
4-
deploymentTarget: '15'
2+
name: ""
3+
vmImage: ""
4+
deploymentTarget: "15"
55

66
jobs:
7-
- job: ${{ parameters.name }}
7+
- job: ${{parameters.name}}
88
timeoutInMinutes: 30
99
pool:
10-
vmImage: ${{ parameters.vmImage }}
11-
12-
steps:
13-
- template: cmake.yml
14-
parameters:
15-
vmImage: ${{ parameters.vmImage }}
16-
17-
- script: |
18-
sudo xcode-select --switch /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer
19-
displayName: 'Select Xcode $(XCODE_VERSION)'
10+
vmImage: ${{parameters.vmImage}}
2011

21-
- script: |
22-
cmake -G Xcode -B buildiOS -D IOS=ON -D DEPLOYMENT_TARGET=${{ parameters.deploymentTarget }} -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_DEBUG_TRACE=ON -D CMAKE_IOS_INSTALL_COMBINED=NO
23-
displayName: 'Generate iOS solution'
12+
steps:
13+
- template: cmake.yml
14+
parameters:
15+
vmImage: ${{parameters.vmImage}}
2416

25-
- task: Xcode@5
26-
inputs:
27-
xcWorkspacePath: 'buildiOS/BabylonNative.xcodeproj'
28-
scheme: 'Playground'
29-
sdk: 'iphoneos'
30-
useXcpretty: false
31-
configuration: Release
32-
displayName: 'Build Playground iOS'
17+
- script: |
18+
sudo xcode-select --switch /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer
19+
displayName: "Select Xcode $(XCODE_VERSION)"
3320
21+
- script: |
22+
cmake -G Xcode -B buildiOS -D IOS=ON -D DEPLOYMENT_TARGET=${{parameters.deploymentTarget}} -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_DEBUG_TRACE=ON -D CMAKE_IOS_INSTALL_COMBINED=NO
23+
displayName: "Generate iOS solution"
3424
25+
- task: Xcode@5
26+
inputs:
27+
xcWorkspacePath: "buildiOS/BabylonNative.xcodeproj"
28+
scheme: "Playground"
29+
sdk: "iphoneos"
30+
useXcpretty: false
31+
configuration: Release
32+
displayName: "Build Playground iOS"

‎.github/jobs/linux.yml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
parameters:
2-
name: ''
3-
vmImage: ''
4-
CC: ''
5-
CXX: ''
6-
JSEngine: ''
2+
name: ""
3+
vmImage: ""
4+
CC: ""
5+
CXX: ""
6+
JSEngine: ""
77
enableSanitizers: false
88

99
jobs:
10-
- job: ${{ parameters.name }}
10+
- job: ${{parameters.name}}
1111
timeoutInMinutes: 30
1212
pool:
13-
vmImage: ${{ parameters.vmImage }}
13+
vmImage: ${{parameters.vmImage}}
1414

1515
variables:
16-
SANITIZER_FLAG: ${{ coalesce(replace(format('{0}', parameters.enableSanitizers), 'True', 'ON'), 'OFF') }}
17-
CC: ${{ parameters.CC }}
18-
CXX: ${{ parameters.CXX }}
19-
16+
SANITIZER_FLAG: ${{coalesce(replace(format('{0}', parameters.enableSanitizers), 'True', 'ON'), 'OFF')}}
17+
CC: ${{parameters.CC}}
18+
CXX: ${{parameters.CXX}}
19+
2020
steps:
21-
- template: cmake.yml
22-
parameters:
23-
vmImage: ${{ parameters.vmImage }}
24-
25-
- script: |
26-
sudo apt-get update
27-
sudo apt-get install libjavascriptcoregtk-4.1-dev libgl1-mesa-dev libcurl4-openssl-dev libwayland-dev clang
28-
displayName: 'Install packages'
29-
30-
- script: |
31-
cmake -G Ninja -B build -D JAVASCRIPTCORE_LIBRARY=/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.1.so -D NAPI_JAVASCRIPT_ENGINE=${{ parameters.JSEngine }} -D CMAKE_BUILD_TYPE=RelWithDebInfo -D BX_CONFIG_DEBUG=ON -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D OpenGL_GL_PREFERENCE=GLVND -D BABYLON_DEBUG_TRACE=ON -D ENABLE_SANITIZERS=$(SANITIZER_FLAG) .
32-
ninja -C build
33-
displayName: 'Build X11'
34-
35-
# Memory leaks on CI is disabled due to memory leaks reported with xvfb and impossible to add to ignore list.
36-
# See https://github.com/BabylonJS/BabylonNative/issues/1575
37-
38-
- script: |
39-
cd build/Apps/Playground
40-
# Command line to suppress false positive memory leaks :
41-
# ASAN_OPTIONS=detect_leaks=1 LSAN_OPTIONS=suppressions=../../../.github/asan_suppress.txt xvfb-run ./Playground app:///Scripts/validation_native.js
42-
xvfb-run ./Playground app:///Scripts/validation_native.js
43-
displayName: 'Validation Tests'
44-
45-
- script: |
46-
cd build/Apps/UnitTests
47-
xvfb-run ./UnitTests
48-
displayName: 'Unit Tests'
49-
50-
- task: PublishBuildArtifacts@1
51-
inputs:
52-
artifactName: '${{ parameters.name }} Rendered Pictures'
53-
pathtoPublish: 'build/Apps/Playground/Results'
54-
displayName: 'Publish Tests ${{ parameters.name }} Results'
55-
condition: always()
56-
- task: PublishBuildArtifacts@1
57-
inputs:
58-
artifactName: '${{ parameters.name }} Error Pictures'
59-
pathtoPublish: 'build/Apps/Playground/Errors'
60-
displayName: 'Publish Tests ${{ parameters.name }} Errors'
61-
condition: failed()
21+
- template: cmake.yml
22+
parameters:
23+
vmImage: ${{parameters.vmImage}}
24+
25+
- script: |
26+
sudo apt-get update
27+
sudo apt-get install libjavascriptcoregtk-4.1-dev libgl1-mesa-dev libcurl4-openssl-dev libwayland-dev clang
28+
displayName: "Install packages"
29+
30+
- script: |
31+
cmake -G Ninja -B build -D JAVASCRIPTCORE_LIBRARY=/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.1.so -D NAPI_JAVASCRIPT_ENGINE=${{parameters.JSEngine}} -D CMAKE_BUILD_TYPE=RelWithDebInfo -D BX_CONFIG_DEBUG=ON -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D OpenGL_GL_PREFERENCE=GLVND -D BABYLON_DEBUG_TRACE=ON -D ENABLE_SANITIZERS=$(SANITIZER_FLAG) .
32+
ninja -C build
33+
displayName: "Build X11"
34+
35+
# Memory leaks on CI is disabled due to memory leaks reported with xvfb and impossible to add to ignore list.
36+
# See https://github.com/BabylonJS/BabylonNative/issues/1575
37+
38+
- script: |
39+
cd build/Apps/Playground
40+
# Command line to suppress false positive memory leaks :
41+
# ASAN_OPTIONS=detect_leaks=1 LSAN_OPTIONS=suppressions=../../../.github/asan_suppress.txt xvfb-run ./Playground app:///Scripts/validation_native.js
42+
xvfb-run ./Playground app:///Scripts/validation_native.js
43+
displayName: "Validation Tests"
44+
45+
- script: |
46+
cd build/Apps/UnitTests
47+
xvfb-run ./UnitTests
48+
displayName: "Unit Tests"
49+
50+
- task: PublishBuildArtifacts@1
51+
inputs:
52+
artifactName: "${{parameters.name}} Rendered Pictures"
53+
pathtoPublish: "build/Apps/Playground/Results"
54+
displayName: "Publish Tests ${{parameters.name}} Results"
55+
condition: always()
56+
- task: PublishBuildArtifacts@1
57+
inputs:
58+
artifactName: "${{parameters.name}} Error Pictures"
59+
pathtoPublish: "build/Apps/Playground/Errors"
60+
displayName: "Publish Tests ${{parameters.name}} Errors"
61+
condition: failed()

0 commit comments

Comments
 (0)