[CI] Separate out steps for M1 pipeline

dmlc · Jun 25, 2024 · bd253b2 · bd253b2
1 parent 4abf24a
commit bd253b2
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 27 deletions.
diff --git a/tests/buildkite/build-jvm-macos-m1.sh b/tests/buildkite/build-jvm-macos-m1.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source tests/buildkite/conftest.sh
+
+# Display system info
+echo "--- Display system information"
+set -x
+system_profiler SPSoftwareDataType
+sysctl -n machdep.cpu.brand_string
+uname -m
+set +x
+
+# Build XGBoost4J binary
+echo "--- Build libxgboost4j.dylib"
+set -x
+mkdir build
+pushd build
+export JAVA_HOME=$(/usr/libexec/java_home)
+cmake .. -GNinja -DJVM_BINDINGS=ON -DUSE_OPENMP=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
+ninja -v
+popd
+rm -rf build
+otool -L lib/libxgboost.dylib
+set +x
+
+echo "--- Upload libxgboost4j.dylib"
+set -x
+pushd lib
+mv -v libxgboost4j.dylib libxgboost4j_m1_${BUILDKITE_COMMIT}.dylib
+buildkite-agent artifact upload libxgboost4j_m1_${BUILDKITE_COMMIT}.dylib
+#if [[ ($is_pull_request == 0) && ($is_release_branch == 1) ]]
+#then
+  aws s3 cp libxgboost4j_m1_${BUILDKITE_COMMIT}.dylib \
+    s3://xgboost-nightly-builds/${BRANCH_NAME}/libxgboost4j/ \
+    --acl public-read --no-progress
+#fi
+popd
+set +x
diff --git a/tests/buildkite/pipeline-mac-m1.yml b/tests/buildkite/pipeline-mac-m1.yml
@@ -1,6 +1,11 @@
 steps:
   - block: ":rocket: Run this test job"
     if: build.pull_request.id != null || build.branch =~ /^dependabot\//
+  - label: ":macos: Build XGBoost4J for MacOS M1"
+    command: "tests/buildkite/build-jvm-macos-m1.sh"
+    key: mac-m1-jvm
+    agents:
+      queue: mac-mini-m1
   - label: ":macos: Build and Test XGBoost for MacOS M1 with Clang 11"
     command: "tests/buildkite/test-macos-m1-clang11.sh"
     key: mac-m1-appleclang11

diff --git a/tests/buildkite/test-macos-m1-clang11.sh b/tests/buildkite/test-macos-m1-clang11.sh
@@ -12,33 +12,6 @@ sysctl -n machdep.cpu.brand_string
 uname -m
 set +x
 
-# Build XGBoost4J binary
-echo "--- Build libxgboost4j.dylib"
-set -x
-mkdir build
-pushd build
-export JAVA_HOME=$(/usr/libexec/java_home)
-cmake .. -GNinja -DJVM_BINDINGS=ON -DUSE_OPENMP=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
-ninja -v
-popd
-rm -rf build
-otool -L lib/libxgboost.dylib
-set +x
-
-echo "--- Upload Python wheel"
-set -x
-pushd lib
-mv -v libxgboost4j.dylib libxgboost4j_m1_${BUILDKITE_COMMIT}.dylib
-buildkite-agent artifact upload libxgboost4j_m1_${BUILDKITE_COMMIT}.dylib
-if [[ ($is_pull_request == 0) && ($is_release_branch == 1) ]]
-then
-  aws s3 cp libxgboost4j_m1_${BUILDKITE_COMMIT}.dylib \
-    s3://xgboost-nightly-builds/${BRANCH_NAME}/libxgboost4j/ \
-    --acl public-read --no-progress
-fi
-popd
-set +x
-
 # Ensure that XGBoost can be built with Clang 11
 echo "--- Build and Test XGBoost with MacOS M1, Clang 11"
 set -x
@@ -49,3 +22,4 @@ cmake .. -GNinja -DCMAKE_C_COMPILER=${LLVM11_PATH}/bin/clang \
   -DCMAKE_CXX_COMPILER=${LLVM11_PATH}/bin/clang++ -DGOOGLE_TEST=ON \
   -DUSE_DMLC_GTEST=ON
 ninja -v
+./testxgboost