You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by wa...@apache.org on 2022/07/18 09:08:51 UTC
[incubator-pegasus] branch master updated: fix(github): correct rdsn and thirdparty dir for CI workflows (#1057)
This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 07bbf4d9a fix(github): correct rdsn and thirdparty dir for CI workflows (#1057)
07bbf4d9a is described below
commit 07bbf4d9a4bc7f87f4b8dee173ffe32ffa28a03c
Author: Dan Wang <em...@126.com>
AuthorDate: Mon Jul 18 17:08:45 2022 +0800
fix(github): correct rdsn and thirdparty dir for CI workflows (#1057)
---
.github/workflows/lint_and_test_cpp.yaml | 41 ++++++++++++++++-------------
.github/workflows/pegasus-regular-build.yml | 12 ---------
2 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml
index 626b02290..14431cdde 100644
--- a/.github/workflows/lint_and_test_cpp.yaml
+++ b/.github/workflows/lint_and_test_cpp.yaml
@@ -75,11 +75,10 @@ jobs:
with:
filters: |
rdsn:
- - 'rdsn/**'
+ - 'src/rdsn/**'
thirdparty:
- 'thirdparty/**'
- name: Unpack prebuilt third-parties
- working-directory: rdsn
if: steps.changes.outputs.thirdparty == 'false'
run: unzip /root/thirdparties-bin.zip -d ./thirdparty
- name: Rebuild third-parties
@@ -90,7 +89,7 @@ jobs:
cmake -DCMAKE_BUILD_TYPE=Release -B build/
cmake --build build/ -j $(($(nproc)/2+1))
- name: Compilation and Unit Testing
- if: steps.changes.outputs.rdsn == 'true'
+ if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.thirdparty == 'true'
run: |
export LD_LIBRARY_PATH=`pwd`/thirdparty/output/lib:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
ulimit -s unlimited
@@ -117,11 +116,10 @@ jobs:
with:
filters: |
rdsn:
- - 'rdsn/**'
+ - 'src/rdsn/**'
thirdparty:
- 'thirdparty/**'
- name: Unpack prebuilt third-parties
- working-directory: rdsn
if: steps.changes.outputs.thirdparty == 'false'
run: unzip /root/thirdparties-bin.zip -d ./thirdparty
- name: Rebuild third-parties
@@ -132,7 +130,7 @@ jobs:
cmake -DCMAKE_BUILD_TYPE=Release -B build/
cmake --build build/ -j $(($(nproc)/2+1))
- name: Compilation and Unit Testing
- if: steps.changes.outputs.rdsn == 'true'
+ if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.thirdparty == 'true'
run: |
export LD_LIBRARY_PATH=`pwd`/thirdparty/output/lib:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
ulimit -s unlimited
@@ -159,11 +157,10 @@ jobs:
with:
filters: |
rdsn:
- - 'rdsn/**'
+ - 'src/rdsn/**'
thirdparty:
- 'thirdparty/**'
- name: Unpack prebuilt third-parties
- working-directory: rdsn
if: steps.changes.outputs.thirdparty == 'false'
run: unzip /root/thirdparties-bin.zip -d ./thirdparty
- name: Rebuild third-parties
@@ -174,7 +171,7 @@ jobs:
cmake -DCMAKE_BUILD_TYPE=Release -B build/
cmake --build build/ -j $(($(nproc)/2+1))
- name: Compilation and Unit Testing
- if: steps.changes.outputs.rdsn == 'true'
+ if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.thirdparty == 'true'
run: |
export LD_LIBRARY_PATH=`pwd`/thirdparty/output/lib:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
ulimit -s unlimited
@@ -201,11 +198,10 @@ jobs:
with:
filters: |
rdsn:
- - 'rdsn/**'
+ - 'src/rdsn/**'
thirdparty:
- 'thirdparty/**'
- name: Unpack prebuilt third-parties
- working-directory: rdsn
if: steps.changes.outputs.thirdparty == 'false'
run: unzip /root/thirdparties-bin.zip -d ./thirdparty
- name: Rebuild third-parties
@@ -216,7 +212,7 @@ jobs:
cmake -DCMAKE_BUILD_TYPE=Release -B build/
cmake --build build/ -j $(($(nproc)/2+1))
- name: Compilation and Unit Testing
- if: steps.changes.outputs.rdsn == 'true'
+ if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.thirdparty == 'true'
run: |
export LD_LIBRARY_PATH=`pwd`/thirdparty/output/lib:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
ulimit -s unlimited
@@ -237,24 +233,31 @@ jobs:
id: changes
with:
filters: |
- rdsn:
- - 'rdsn/**'
pegasus:
- 'src/**'
+ thirdparty:
+ - 'thirdparty/**'
- name: Unpack prebuilt third-parties
- if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.pegasus == 'true'
+ if: steps.changes.outputs.thirdparty == 'false'
run: unzip /root/thirdparties-bin.zip -d ./thirdparty
+ - name: Rebuild third-parties
+ if: steps.changes.outputs.thirdparty == 'true'
+ working-directory: thirdparty
+ run: |
+ mkdir build
+ cmake -DCMAKE_BUILD_TYPE=Release -B build/
+ cmake --build build/ -j $(($(nproc)/2+1))
- name: Compilation
- if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.pegasus == 'true'
+ if: steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
run: ./run.sh build -c -j $(($(nproc)/2+1))
- name: Packaging Server
- if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.pegasus == 'true'
+ if: steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
run: ./run.sh pack_server
- name: Packaging Tools
- if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.pegasus == 'true'
+ if: steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
run: ./run.sh pack_tools
- name: Unit Testing
- if: steps.changes.outputs.rdsn == 'true' || steps.changes.outputs.pegasus == 'true'
+ if: steps.changes.outputs.pegasus == 'true' || steps.changes.outputs.thirdparty == 'true'
run: |
source ./scripts/config_hdfs.sh
./run.sh test --on_travis
diff --git a/.github/workflows/pegasus-regular-build.yml b/.github/workflows/pegasus-regular-build.yml
index b3bad6f72..475141376 100644
--- a/.github/workflows/pegasus-regular-build.yml
+++ b/.github/workflows/pegasus-regular-build.yml
@@ -63,21 +63,9 @@ jobs:
cd incubator-pegasus
- name: Unpack prebuilt third-parties
run: unzip /root/thirdparties-bin.zip -d ./thirdparty
- - name: Compilation rdsn on GCC
- if: ${{ matrix.compiler-family == 'gcc' }}
- run: |
- cd ./rdsn
- ./run.sh build -c --skip_thirdparty
- name: Compilation pegasus on GCC
if: ${{ matrix.compiler-family == 'gcc' }}
run: ./run.sh build -c --skip_thirdparty
- - name: Compilation rdsn on Clang
- if: ${{ matrix.compiler-family == 'clang' }}
- env:
- COMPILER: ${{ matrix.compiler }}
- run: |
- cd ./rdsn
- ./run.sh build --compiler $COMPILER --skip_thirdparty
- name: Compilation pegasus on Clang
if: ${{ matrix.compiler-family == 'clang' }}
env:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org