From bbb4d164189b7038a513bed977f291f342dc4c83 Mon Sep 17 00:00:00 2001
From: Chao Sun <sunchao@apache.org>
Date: Thu, 15 Feb 2024 23:13:26 -0800
Subject: [PATCH] simplify

---
 .github/actions/java-test-steps.yml | 52 +++++++++++++++++++
 .github/workflows/pr_build.yml      | 77 ++++-------------------------
 2 files changed, 61 insertions(+), 68 deletions(-)
 create mode 100644 .github/actions/java-test-steps.yml

diff --git a/.github/actions/java-test-steps.yml b/.github/actions/java-test-steps.yml
new file mode 100644
index 0000000000..6aac2f1556
--- /dev/null
+++ b/.github/actions/java-test-steps.yml
@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+inputs:
+  builder:
+    description: 'The builder used to setup the toolchain'
+    required: true
+    default: 'setup-builder'
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v4
+    - name: Setup Rust & Java toolchain
+      uses: ./.github/actions/${{inputs.builder}}
+      with:
+        rust-version: nightly
+        jdk-version: ${{env.JAVA_VERSION}}
+        architecture: aarch64
+
+    - name: Run cargo build
+      run: |
+        cd core
+        cargo build
+
+    - name: Cache Maven dependencies
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: Run Maven compile
+      run: |
+        ./mvnw compile test-compile scalafix:scalafix -Psemanticdb
+
+
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index fd5a532a92..d245eb6b30 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -91,29 +91,10 @@ jobs:
     container:
       image: amd64/rust
     steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-builder
-        with:
-          rust-version: nightly
-          jdk-version: ${{env.JAVA_VERSION}}
-
-      - name: Run cargo build
-        run: |
-          cd core
-          cargo build
-
-      - name: Cache Maven dependencies
-        uses: actions/cache@v4
+      - name: Java test steps
+        uses: ./.github/actions/java-test-steps.yml
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: Run Maven compile
-        run: |
-          ./mvnw compile test-compile scalafix:scalafix -Psemanticdb
+          builder: setup-macos-builder
 
       - name: Run tests
         run: |
@@ -169,30 +150,10 @@ jobs:
     name: Java test (macos)
     runs-on: macos-13
     steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: nightly
-          jdk-version: ${{env.JAVA_VERSION}}
-          architecture: x64
-
-      - name: Run cargo build
-        run: |
-          cd core
-          cargo build
-
-      - name: Cache Maven dependencies
-        uses: actions/cache@v4
+      - name: Java test steps
+        uses: ./.github/actions/java-test-steps.yml
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: Run Maven compile
-        run: |
-          ./mvnw compile test-compile scalafix:scalafix -Psemanticdb
+          builder: setup-macos-builder
 
       - name: Run tests
         run: |
@@ -248,30 +209,10 @@ jobs:
     name: Java test (macos-aarch64)
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: nightly
-          jdk-version: ${{env.JAVA_VERSION}}
-          architecture: aarch64
-
-      - name: Run cargo build
-        run: |
-          cd core
-          cargo build
-
-      - name: Cache Maven dependencies
-        uses: actions/cache@v4
+      - name: Java test steps
+        uses: ./.github/actions/java-test-steps.yml
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: Run Maven compile
-        run: |
-          ./mvnw compile test-compile scalafix:scalafix -Psemanticdb
+          builder: setup-macos-builder
 
       - name: Run tests
         run: |