Skip to content

Commit

Permalink
simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
sunchao committed Feb 16, 2024
1 parent ba31d08 commit eb16bcd
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 59 deletions.
43 changes: 43 additions & 0 deletions .github/actions/java-test/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# 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.

runs:
using: "composite"
steps:
- name: Run cargo build
shell: bash
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
shell: bash
run: |
./mvnw compile test-compile scalafix:scalafix -Psemanticdb
- name: Run tests
shell: bash
run: |
SPARK_HOME=`pwd` ./mvnw clean install
69 changes: 10 additions & 59 deletions .github/workflows/pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,27 +97,12 @@ jobs:
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
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
- uses: actions/checkout@v4
- name: Java test steps
uses: ./.github/actions/java-test

- name: Run tests
run: |
SPARK_HOME=`pwd` ./mvnw clean install

macos-rust-test:
name: Rust test (macos)
Expand Down Expand Up @@ -177,26 +162,9 @@ jobs:
jdk-version: ${{env.JAVA_VERSION}}
architecture: x64

- 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
- uses: actions/checkout@v4
- name: Java test steps
uses: ./.github/actions/java-test

macos-aarch64-rust-test:
name: Rust test (macos-aarch64)
Expand Down Expand Up @@ -256,23 +224,6 @@ jobs:
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
- uses: actions/checkout@v4
- name: Java test steps
uses: ./.github/actions/java-test

0 comments on commit eb16bcd

Please sign in to comment.