From 119dc9b4b01e8010bb37f1db6aaf1164b0c3f17f Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 21 Sep 2018 14:29:43 -0400 Subject: [PATCH 1/2] Create build steps for android-mac --- etc/ci/buildbot_steps.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index b11858628fb..6f6dd24f386 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -184,6 +184,16 @@ android: - bash ./etc/ci/lockfile_changed.sh - python ./etc/ci/check_dynamic_symbols.py - ./etc/ci/clean_build_artifacts.sh + +android-mac: + commands: + - ./mach clean-nightlies --keep 3 --force + - ./mach clean-cargo-cache --keep 3 --force + - ./etc/ci/bootstrap-android-and-accept-licences.sh + - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --android --dev + - env --unset ANDROID_NDK --unset ANDROID_SDK ./mach package --android --dev + - bash ./etc/ci/lockfile_changed.sh + - ./etc/ci/clean_build_artifacts.sh android-x86: env: From f53ac35088ec8e83c467896e69a51afd4a00d9a4 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 24 Sep 2018 16:16:31 -0400 Subject: [PATCH 2/2] Fix trailing whitespace. --- etc/ci/buildbot_steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index 6f6dd24f386..fb8f5a0af8e 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -184,7 +184,7 @@ android: - bash ./etc/ci/lockfile_changed.sh - python ./etc/ci/check_dynamic_symbols.py - ./etc/ci/clean_build_artifacts.sh - + android-mac: commands: - ./mach clean-nightlies --keep 3 --force