From b918ac8e70a95bafea024aa1283d5b6b28b88a91 Mon Sep 17 00:00:00 2001 From: Chao Sun Date: Thu, 15 Feb 2024 23:13:26 -0800 Subject: [PATCH] simplify --- .github/workflows/pr_build.yml | 89 ++++------------------------------ 1 file changed, 9 insertions(+), 80 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index fd5a532a92..1b36df5978 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -91,33 +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 - - - name: Run tests - run: | - SPARK_HOME=`pwd` ./mvnw clean install + builder: setup-macos-builder macos-rust-test: name: Rust test (macos) @@ -169,34 +146,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 - - - name: Run tests - run: | - SPARK_HOME=`pwd` ./mvnw clean install + builder: setup-macos-builder macos-aarch64-rust-test: name: Rust test (macos-aarch64) @@ -248,31 +201,7 @@ 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 + - name: Java test steps + - uses: ./.github/actions/java-test-steps.yml 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 - - - name: Run tests - run: | - SPARK_HOME=`pwd` ./mvnw clean install + builder: setup-macos-builder