Skip to content

Commit a702f39

Browse files
shreyajnmax-krasnyanskyCISC
authored
CI Snapdragon: Switch ubuntu-latest to ubuntu-slim runner (ggml-org#22303)
* switch ubuntu-latest to ubuntu-slim * Fix the path for upload so CI doesn't fail * Update .github/workflows/build-and-test-snapdragon.yml Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * Use -slim image for key check and consistent naming for artifact dir Signed-off-by: Max Krasnyansky <maxk@qti.qualcomm.com> * Remove check-secret extra job * move QDC key check for Run QDC jobs step specifically * add a step before to check the secret for qdc jobs --------- Signed-off-by: Max Krasnyansky <maxk@qti.qualcomm.com> Co-authored-by: Max Krasnyansky <maxk@qti.qualcomm.com> Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com>
1 parent 13d36cf commit a702f39

1 file changed

Lines changed: 18 additions & 15 deletions

File tree

.github/workflows/build-and-test-snapdragon.yml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,19 @@ jobs:
4949
cp docs/backend/snapdragon/CMakeUserPresets.json .
5050
cmake --preset arm64-android-snapdragon-release -B build
5151
cmake --build build
52-
cmake --install build --prefix pkg-adb/llama.cpp
52+
cmake --install build --prefix pkg-snapdragon/llama.cpp
5353
5454
- name: Upload Llama.CPP Snapdragon Android Build Artifact
5555
if: ${{ always() && steps.build_llama_cpp_snapdragon_android.outcome == 'success' }}
5656
uses: actions/upload-artifact@v6
5757
with:
5858
name: llama-cpp-android-arm64-snapdragon
59-
path: pkg-adb/llama.cpp
60-
61-
check-secret:
62-
runs-on: ubuntu-latest
63-
outputs:
64-
has-key: ${{ steps.check.outputs.has-key }}
65-
steps:
66-
- id: check
67-
run: echo "has-key=${{ secrets.QDC_API_KEY != '' }}" >> "$GITHUB_OUTPUT"
59+
path: pkg-snapdragon/llama.cpp
6860

6961
test-snapdragon-qdc:
7062
name: Test on QDC Android Device (${{ matrix.device }})
71-
needs: [android-ndk-snapdragon, check-secret]
72-
if: needs.check-secret.outputs.has-key == 'true'
73-
runs-on: ubuntu-latest
63+
needs: [android-ndk-snapdragon]
64+
runs-on: ubuntu-slim
7465
strategy:
7566
fail-fast: false
7667
matrix:
@@ -81,24 +72,36 @@ jobs:
8172
uses: actions/checkout@v6
8273

8374
- name: Download build artifact
84-
uses: actions/download-artifact@v4
75+
uses: actions/download-artifact@v7
8576
with:
8677
name: llama-cpp-android-arm64-snapdragon
87-
path: pkg-snapdragon/
78+
path: pkg-snapdragon/llama.cpp
8879

8980
- name: Set up Python
9081
uses: actions/setup-python@v5
9182
with:
9283
python-version: '3.x'
9384
cache: pip
9485

86+
- name: Install system dependencies
87+
run: |
88+
sudo apt-get update
89+
sudo apt-get install -y curl unzip
90+
9591
- name: Install QDC SDK wheel
9692
run: |
9793
curl -fSL -o qdc_sdk.zip https://softwarecenter.qualcomm.com/api/download/software/tools/Qualcomm_Device_Cloud_SDK/All/0.2.3/qualcomm_device_cloud_sdk-0.2.3.zip
9894
unzip qdc_sdk.zip -d qdc_sdk
9995
pip install qdc_sdk/qualcomm_device_cloud_sdk-0.2.3-py3-none-any.whl
10096
97+
- name: Check QDC API key
98+
id: check_secret
99+
env:
100+
QDC_API_KEY: ${{ secrets.QDC_API_KEY }}
101+
run: echo "has-qdc-key=${{ env.QDC_API_KEY != '' }}" >> "$GITHUB_OUTPUT"
102+
101103
- name: Run QDC tests (${{ matrix.device }})
104+
if: steps.check_secret.outputs.has-qdc-key == 'true'
102105
run: |
103106
python scripts/snapdragon/qdc/run_qdc_jobs.py \
104107
--test all \

0 commit comments

Comments
 (0)