Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ jobs:
# iOS
- template: jobs/ios.yml
parameters:
name: 'iOS_Xcode142'
name: 'iOS_Xcode162'
vmImage: 'macOS-latest'
xCodeVersion: 14.2
simulator: 'iPhone 11'
xCodeVersion: 16.2
simulator: 'iPhone 16'

- template: jobs/ios.yml
parameters:
name: 'iOS_Xcode150'
name: 'iOS_Xcode152'
vmImage: 'macOS-13'
xCodeVersion: 15.0
xCodeVersion: 15.2
simulator: 'iPhone 14'

# Linux
Expand Down
14 changes: 8 additions & 6 deletions .github/jobs/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ jobs:
timeoutInMinutes: 30

pool:
vmImage: macos-latest
vmImage: macos-13

steps:
- script: |
echo Install Android image
export JAVA_HOME=$JAVA_HOME_8_X64
echo 'y' | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-27;default;x86_64'
echo 'y' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
echo Create AVD
Expand All @@ -22,7 +23,7 @@ jobs:

- script: |
echo Start emulator
nohup $ANDROID_HOME/emulator/emulator -avd Pixel_API_27 -gpu host -no-window 2>&1 &
nohup $ANDROID_HOME/emulator/emulator -avd Pixel_API_27 -gpu host -no-window -no-audio -no-boot-anim 2>&1 &
echo Wait for emulator
$ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do echo '.'; sleep 1; done'
$ANDROID_HOME/platform-tools/adb devices
Expand All @@ -34,13 +35,14 @@ jobs:
workingDirectory: 'Tests/UnitTests/Android'
options: '-PabiFilters=x86_64 -PjsEngine=${{parameters.jsEngine}} -PndkVersion=$(ndkVersion)'
tasks: 'connectedAndroidTest'
jdkVersionOption: 1.11
jdkVersionOption: 1.17
displayName: 'Run Connected Android Test'

- script: |
export results=$(find ./app/build/outputs/androidTest-results -name "*.txt")
echo cat "$results"
cat "$results"
find ./app/build/outputs/androidTest-results -name "*.txt" -print0 | while IFS= read -r -d '' file; do
echo "cat \"$file\""
cat "$file"
done
workingDirectory: 'Tests/UnitTests/Android'
condition: succeededOrFailed()
displayName: 'Dump logcat from Test Results'
Expand Down
7 changes: 5 additions & 2 deletions .github/jobs/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ jobs:
cmake -B Build/iOS -G Xcode -D IOS=ON
displayName: 'Configure CMake'

- script: |
echo Boot "${{parameters.simulator}}"
xcrun simctl boot "${{parameters.simulator}}"
displayName: 'Boot Simulator'

- task: Xcode@5
inputs:
xcWorkspacePath: 'Build/iOS/JsRuntimeHost.xcodeproj'
Expand All @@ -30,8 +35,6 @@ jobs:
displayName: 'Build Xcode Project'

- script: |
echo Boot "${{parameters.simulator}}"
xcrun simctl boot "${{parameters.simulator}}"
echo Install UnitTests app
xcrun simctl install booted "Build/iOS/Tests/UnitTests/RelWithDebInfo-iphonesimulator/UnitTests.app"
echo Launch UnitTests app
Expand Down
4 changes: 2 additions & 2 deletions .github/jobs/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:

steps:
- script: |
sudo xcode-select --switch /Applications/Xcode_14.0.app/Contents/Developer
displayName: 'Select Xcode 14.0'
sudo xcode-select --switch /Applications/Xcode_15.1.app/Contents/Developer
displayName: 'Select Xcode 15.1'

- script: |
cmake -B Build/macOS -GXcode
Expand Down
2 changes: 1 addition & 1 deletion Tests/UnitTests/Android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if (project.hasProperty("jsEngine")) {
android {
namespace 'com.jsruntimehost.unittests'
compileSdk 33
ndkVersion = "21.4.7075529"
ndkVersion = "23.1.7779620"
if (project.hasProperty("ndkVersion")) {
ndkVersion = project.property("ndkVersion")
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/UnitTests/Android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.3.1' apply false
id 'com.android.library' version '7.3.1' apply false
id 'com.android.application' version '8.8.0' apply false
id 'com.android.library' version '8.8.0' apply false
}
2 changes: 2 additions & 0 deletions Tests/UnitTests/Android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@ android.useAndroidX=true
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
# Select the JavaScript engine to use
#jsEngine=JavaScriptCore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 20 12:19:56 PST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Loading