[libcxx-commits] [libcxx] [libc++][Android] Enable Android testing in BuildKite CI (PR #69275)

Ryan Prichard via libcxx-commits libcxx-commits at lists.llvm.org
Mon Oct 23 14:03:05 PDT 2023


https://github.com/rprichard updated https://github.com/llvm/llvm-project/pull/69275

>From d7e2cea1a35a90b0b63f7b593a5d78c3762a4d4a Mon Sep 17 00:00:00 2001
From: Ryan Prichard <rprichard at google.com>
Date: Mon, 16 Oct 2023 17:26:31 -0700
Subject: [PATCH 1/3] [libc++][Android] Enable Android testing in BuildKite CI

Enable testing for two NDK configurations:
 - android-ndk-21-def-x86
 - android-ndk-33-goog-x86_64

Fixes: https://github.com/llvm/llvm-project/issues/69270
---
 libcxx/utils/ci/buildkite-pipeline.yml | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 460c5a8c4301dc4..523146c92d96624 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -1116,3 +1116,33 @@ steps:
           - exit_status: -1  # Agent was lost
             limit: 2
       timeout_in_minutes: 120
+
+  - group: ":android: Android"
+    steps:
+    - label: "Android 5.0, x86 NDK"
+      command: "libcxx/utils/ci/run-buildbot android-ndk-21-def-x86"
+      artifact_paths:
+        - "**/test-results.xml"
+        - "**/*.abilist"
+      agents:
+        queue: "libcxx-builders"
+        os: "android"
+      retry:
+        automatic:
+          - exit_status: -1  # Agent was lost
+            limit: 2
+      timeout_in_minutes: 120
+
+    - label: "Android 13, x86_64 NDK"
+      command: "libcxx/utils/ci/run-buildbot android-ndk-33-goog-x86_64"
+      artifact_paths:
+        - "**/test-results.xml"
+        - "**/*.abilist"
+      agents:
+        queue: "libcxx-builders"
+        os: "android"
+      retry:
+        automatic:
+          - exit_status: -1  # Agent was lost
+            limit: 2
+      timeout_in_minutes: 120

>From f6f87091f5babf03c84d0e2b0b4e007c6524d1d0 Mon Sep 17 00:00:00 2001
From: Ryan Prichard <rprichard at google.com>
Date: Fri, 20 Oct 2023 16:07:44 -0700
Subject: [PATCH 2/3] Add Android as a supported OS in libcxx/docs/index.rst

---
 libcxx/docs/index.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libcxx/docs/index.rst b/libcxx/docs/index.rst
index 9c2a83bde3c0f4f..72c80d7dc954a33 100644
--- a/libcxx/docs/index.rst
+++ b/libcxx/docs/index.rst
@@ -130,6 +130,7 @@ Target platform Target architecture       Notes
 macOS 10.9+     i386, x86_64, arm64       Building the shared library itself requires targetting macOS 10.13+
 FreeBSD 12+     i386, x86_64, arm
 Linux           i386, x86_64, arm, arm64  Only glibc-2.24 and later and no other libc is officially supported
+Android 5.0+    i386, x86_64, arm, arm64
 Windows         i386, x86_64              Both MSVC and MinGW style environments, ABI in MSVC environments is :doc:`unstable <DesignDocs/ABIVersioning>`
 AIX 7.2TL5+     powerpc, powerpc64
 =============== ========================= ============================

>From 0597d7a4f5874410f7801e39395bf5672176152a Mon Sep 17 00:00:00 2001
From: Ryan Prichard <rprichard at google.com>
Date: Mon, 23 Oct 2023 13:50:18 -0700
Subject: [PATCH 3/3] Set the new Android steps as "soft_fail"

---
 libcxx/utils/ci/buildkite-pipeline.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 523146c92d96624..f195331eac2474d 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -1131,6 +1131,7 @@ steps:
         automatic:
           - exit_status: -1  # Agent was lost
             limit: 2
+      soft_fail: true
       timeout_in_minutes: 120
 
     - label: "Android 13, x86_64 NDK"
@@ -1145,4 +1146,5 @@ steps:
         automatic:
           - exit_status: -1  # Agent was lost
             limit: 2
+      soft_fail: true
       timeout_in_minutes: 120



More information about the libcxx-commits mailing list