Skip to content

Commit 1d1a381

Browse files
servo: Make CI use ubuntu runner (#10088)
- Use ubuntu runner for andorid build - Skip release in android build
1 parent 3683cf8 commit 1d1a381

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,3 @@ jobs:
646646
needs: files-changed
647647
if: needs.files-changed.outputs.servo_example == 'true'
648648
uses: ./.github/workflows/servo_example.yaml
649-
secrets:
650-
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
651-
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}

.github/workflows/servo_example.yaml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ name: Servo example
66
on:
77
workflow_dispatch:
88
workflow_call:
9-
secrets:
10-
ANDROID_KEYSTORE_BASE64:
11-
required: true
12-
ANDROID_KEYSTORE_PASSWORD:
13-
required: true
149

1510
jobs:
1611
matrix_build:
@@ -36,12 +31,9 @@ jobs:
3631
working-directory: examples/servo
3732
run: cargo build --release
3833
android_build:
39-
runs-on: macos-latest
34+
runs-on: ubuntu-latest
4035
env:
4136
CARGO_INCREMENTAL: false
42-
CARGO_PROFILE_RELEASE_OPT_LEVEL: s
43-
CARGO_APK_RELEASE_KEYSTORE: /Users/runner/.android/release.keystore
44-
CARGO_APK_RELEASE_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
4537
steps:
4638
- uses: actions/checkout@v5
4739
# required for servo
@@ -55,17 +47,13 @@ jobs:
5547
uses: ./.github/actions/install-linux-dependencies
5648
- name: Install skia dependencies
5749
uses: ./.github/actions/install-skia-dependencies
58-
# required for anroid
50+
# required for android
5951
- name: Install API level
6052
run: ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-30"
6153
- name: Install cargo-apk
6254
run: cargo install cargo-apk
63-
- name: Decode keystore
64-
run: |
65-
mkdir -p /Users/runner/.android
66-
echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > $CARGO_APK_RELEASE_KEYSTORE
6755
- name: Build
6856
working-directory: examples/servo
6957
run: |
70-
export BINDGEN_EXTRA_CLANG_ARGS="--target=aarch64-linux-android30 --sysroot=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/darwin-x86_64/sysroot"
71-
cargo apk build --target aarch64-linux-android --lib --release
58+
export BINDGEN_EXTRA_CLANG_ARGS="--target=aarch64-linux-android30 --sysroot=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/sysroot"
59+
cargo apk build --target aarch64-linux-android --lib

0 commit comments

Comments
 (0)