Skip to content

Commit

Permalink
chore(scala-client-ci): build the server instead of downloading it fr…
Browse files Browse the repository at this point in the history
…om external site
  • Loading branch information
acelyc111 committed Dec 23, 2023
1 parent 05466d3 commit f22bac3
Show file tree
Hide file tree
Showing 6 changed files with 130 additions and 158 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/lint_and_test_java-client.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#
# 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
Expand All @@ -16,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

name: Test - java client
name: Lint and Test - java client
on:
pull_request:
branches:
Expand Down Expand Up @@ -86,12 +85,10 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- uses: "./.github/actions/download_artifact"
- name: Download artifact
uses: "./.github/actions/download_artifact"
- name: Start Pegasus cluster
run: |
apt-get update
apt-get -y install tree
tree ${JAVA_HOME}
export LD_LIBRARY_PATH=$(pwd)/thirdparty/output/lib:${JAVA_HOME}/jre/lib/amd64/server
ulimit -s unlimited
./run.sh start_onebox
Expand Down
103 changes: 103 additions & 0 deletions .github/workflows/lint_and_test_scala-client.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
#
# 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.

name: Test - java client
on:
pull_request:
branches:
- master
- 'v[0-9]+.*' # release branch
- ci-test # testing branch for github action
- '*dev' # developing branch
paths:
- .github/workflows/lint_and_test_java-client.yml
- java-client/**

workflow_dispatch:

defaults:
run:
shell: bash

jobs:
spotless:
name: Spotless
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v1
with:
java-version: 8
- name: spotless
working-directory: ./java-client
run: mvn spotless:check

build_server:
name: Build server
needs: spotless
runs-on: ubuntu-latest
env:
USE_JEMALLOC: OFF
ARTIFACT_NAME: release_for_java_client
BUILD_OPTIONS: -t release
container:
image: apache/pegasus:thirdparties-bin-test-ubuntu2204-${{ github.base_ref }}
steps:
- uses: actions/checkout@v3
- uses: "./.github/actions/rebuild_thirdparty_if_needed"
- uses: "./.github/actions/build_pegasus"
- uses: "./.github/actions/upload_artifact"

test_java_client:
name: Test Java client
needs: build_server
runs-on: ubuntu-latest
env:
ARTIFACT_NAME: release_for_java_client
container:
image: apache/pegasus:thirdparties-bin-test-ubuntu2204-${{ github.base_ref }}
strategy:
fail-fast: false
matrix:
java: [ '8', '11']
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- uses: "./.github/actions/download_artifact"
- name: Start Pegasus cluster
run: |
apt-get update
apt-get -y install tree
tree ${JAVA_HOME}
export LD_LIBRARY_PATH=$(pwd)/thirdparty/output/lib:${JAVA_HOME}/jre/lib/amd64/server
ulimit -s unlimited
./run.sh start_onebox
- name: Recompile thrift
working-directory: ./java-client/scripts
run: ./recompile_thrift.sh
- name: Run Java client tests
working-directory: ./java-client
run: mvn test --no-transfer-progress
55 changes: 0 additions & 55 deletions .github/workflows/test_scala-client.yml

This file was deleted.

25 changes: 24 additions & 1 deletion scala-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ It's built on top of the java client [apache/incubator-pegasus/java-client](http
## Features:

* Scala friendly.

* Serialize/deserialize automatically.

## Example:
Expand Down Expand Up @@ -53,3 +52,27 @@ It's built on top of the java client [apache/incubator-pegasus/java-client](http

c.close
```

## Development

### Format the code

Use scala format tool, see https://github.com/scalameta/scalafmt
```
sbt scalafmtSbt scalafmt test:scalafmt
```

### Run tests

Build Java dependency at first, then build and test Scala client.
```
cd ${PROJECT_ROOT}/java-client/scripts
./recompile_thrift.sh
cd ${PROJECT_ROOT}/java-client
mvn clean package -DskipTests -Dcheckstyle.skip=true
mvn clean install -DskipTests -Dcheckstyle.skip=true
cd ${PROJECT_ROOT}/scala-client
sbt test
```
73 changes: 0 additions & 73 deletions scala-client/scripts/ci-test.sh

This file was deleted.

23 changes: 0 additions & 23 deletions scala-client/scripts/format-all.sh

This file was deleted.

0 comments on commit f22bac3

Please sign in to comment.