Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Android CI vmImage: 'MacOS-12' with vmImage: 'ubuntu-latest' #21172

Closed
wants to merge 21 commits into from
Closed

Replace Android CI vmImage: 'MacOS-12' with vmImage: 'ubuntu-latest' #21172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b4b6f12
vmImage: 'ubuntu-latest'
jchen351 Jun 25, 2024
99e2f7a
start_emulator
jchen351 Jun 25, 2024
3bd2080
use-android-emulator.yml
jchen351 Jun 26, 2024
f713339
reformat
jchen351 Jun 26, 2024
8008add
reformat
jchen351 Jun 26, 2024
4063588
- script: |
jchen351 Jun 26, 2024
9e750d8
Check Android NDKs
jchen351 Jun 28, 2024
b05116a
use-android-ndk.yml
jchen351 Jun 28, 2024
c66f9c5
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --insta…
jchen351 Jun 28, 2024
6ed88fd
onnxruntime-Ubuntu2204-AMD-CPU
jchen351 Jun 28, 2024
a3f11b2
onnxruntime-Ubuntu2204-AMD-CPU
jchen351 Jul 8, 2024
094e39e
adb
jchen351 Jul 9, 2024
a336be6
run-with-android-emulator-steps.yml
jchen351 Jul 9, 2024
c51efdc
run-with-android-emulator-steps.yml
jchen351 Jul 10, 2024
139ce8b
remove
jchen351 Jul 10, 2024
931caef
try remove sudo apt install -y adb
jchen351 Jul 11, 2024
df63792
adding ${ANDROID_SDK_ROOT}/platform-tools to PATH
jchen351 Jul 11, 2024
c3fa19d
Update tools/ci_build/github/azure-pipelines/templates/use-android-em…
jchen351 Jul 12, 2024
88f4c9c
Update tools/ci_build/github/azure-pipelines/templates/use-android-em…
jchen351 Jul 12, 2024
43d096f
Merge branch 'refs/heads/main' into Cjian/ad
jchen351 Jul 15, 2024
391ab56
Remove check Android NDK
jchen351 Jul 15, 2024
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
Prev Previous commit
Next Next commit
- script: | 
          set -e -x \
          uname -m \
          echo "ANDROID_HOME=$ANDROID_HOME" \
          echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \
          ls -R $ANDROID_SDK_ROOT
        displayName: Check Android NDKs
  • Loading branch information
@jchen351
jchen351 committed Jun 26, 2024
commit 40635888dee986d45574cc55d711d582c1278602
33 changes: 33 additions & 0 deletions tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ stages:

- template: "templates/use-android-ndk.yml"

- script: |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these "Check Android NDKs" steps don't seem to show anything. e.g.:
https://dev.azure.com/onnxruntime/onnxruntime/_build/results?buildId=1431601&view=logs&j=b27c03c3-79f9-5527-4b3a-dcfd5ff9627d&t=4c403f51-f20d-5048-3dee-14ef4d2220b5

might be because of the line continuations \ that join all the lines into the first set command.

if these steps are not showing anything now, consider removing them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will also be removed from PR #21340

set -e -x \
uname -m \
echo "ANDROID_HOME=$ANDROID_HOME" \
echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \
ls -R $ANDROID_SDK_ROOT
displayName: Check Android NDKs

- script: |
env | grep ANDROID
displayName: View Android ENVs
Expand Down Expand Up @@ -162,6 +170,16 @@ stages:
displayName: Install coreutils and ninja

- template: "templates/use-android-ndk.yml"
parameters:


- script: |
set -e -x \
uname -m \
echo "ANDROID_HOME=$ANDROID_HOME" \
echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \
ls -R $ANDROID_SDK_ROOT
displayName: Check Android NDKs

- script: |
env | grep ANDROID
Expand Down Expand Up @@ -252,11 +270,26 @@ stages:

- template: "templates/use-android-ndk.yml"

- script: |
set -e -x \
uname -m \
echo "ANDROID_HOME=$ANDROID_HOME" \
echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \
ls -R $ANDROID_SDK_ROOT
displayName: Check Android NDKs

- template: templates/use-android-emulator.yml
parameters:
create: true
start: true

- script: |
set -e -x \
uname -m \
echo "ANDROID_HOME=$ANDROID_HOME" \
echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" \
ls -R $ANDROID_SDK_ROOT
displayName: Check Android NDKs
- script: |
python3 tools/ci_build/build.py \
--android \
Expand Down
1 change: 1 addition & 0 deletions tools/ci_build/github/azure-pipelines/templates/use-android-emulator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ steps:
- ${{ if eq(parameters.create, true) }}:
- script: |
set -e -x
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "emulator"
python3 tools/python/run_android_emulator.py \
--android-sdk-root $(ANDROID_SDK_ROOT) \
--create-avd --system-image "system-images;android-31;default;x86_64"
Expand Down
Loading