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 3a50c55
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 156 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/lint_and_test_java-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ name: Test - java client
on:
pull_request:
branches:
- master
- 'v[0-9]+.*' # release branch
- ci-test # testing branch for github action
- '*dev' # developing branch
- 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/**
Expand Down
119 changes: 119 additions & 0 deletions .github/workflows/lint_and_test_scala-client.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
# 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: Lint and Test - scala client
on:
pull_request:
branches:
- master
- 'v[0-9]+.*' # release branch
paths:
- .github/workflows/lint_and_test_scala-client.yml
- scala-client/**

workflow_dispatch:

defaults:
run:
shell: bash

jobs:
format:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v1
with:
java-version: 8
- name: format
working-directory: ./scala-client
run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck

build_server:
name: Build server
needs: format
runs-on: ubuntu-latest
env:
USE_JEMALLOC: OFF
ARTIFACT_NAME: release_for_scala_client
BUILD_OPTIONS: -t release
container:
image: apache/pegasus:thirdparties-bin-test-ubuntu2204-${{ github.base_ref }}
steps:
- uses: actions/checkout@v3
- name: Setup Sbt
# https://www.scala-lang.org/download/
run: |
curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup -y -v
# source ~/.profile
- name: format
working-directory: ./scala-client
run: |
/root/.local/share/coursier/bin/sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck
source /root/.profile
sbt -V
- uses: "./.github/actions/rebuild_thirdparty_if_needed"
- uses: "./.github/actions/build_pegasus"
- uses: "./.github/actions/upload_artifact"

test:
name: Test Scala client
needs: build_server
runs-on: ubuntu-22.04
env:
ARTIFACT_NAME: release_for_scala_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 }}
- name: Setup Sbt
# https://www.scala-lang.org/download/
run: |
curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup -y -v
# source ~/.profile
- name: Recompile thrift
working-directory: ./java-client/scripts
run: ./recompile_thrift.sh
- name: Build Java client
working-directory: ./java-client
run: |
mvn clean package -DskipTests -Dcheckstyle.skip=true
mvn clean install -DskipTests -Dcheckstyle.skip=true
- name: Download artifact
uses: "./.github/actions/download_artifact"
- name: Start Pegasus cluster
run: |
export LD_LIBRARY_PATH=$(pwd)/thirdparty/output/lib:${JAVA_HOME}/jre/lib/amd64/server
ulimit -s unlimited
./run.sh start_onebox
- name: Run Scala client tests
working-directory: ./scala-client
run: /root/.local/share/coursier/bin/sbt test
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 3a50c55

Please sign in to comment.