Skip to content

Commit

Permalink
separate to build-support
Browse files Browse the repository at this point in the history
  • Loading branch information
acelyc111 committed Aug 5, 2024
1 parent cbc45ee commit d3754b3
Show file tree
Hide file tree
Showing 19 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/lint_and_test_cpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ on:
- CMakeLists.txt
- cmake_modules/**
- run.sh
- scripts/pack_server.sh
- scripts/pack_tools.sh
- build-support/pack_server.sh
- build-support/pack_tools.sh
- src/**
- thirdparty/**

Expand All @@ -55,7 +55,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: clang-format
run: ./scripts/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .
run: ./build-support/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .

cpp_clang_tidy_linter:
name: Tidy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regular-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: clang-format
run: ./scripts/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .
run: ./build-support/run-clang-format.py --clang-format-executable clang-format-14 -e ./src/shell/linenoise -e ./src/shell/sds -e ./thirdparty -r .

build_cpp:
name: Build Cpp
Expand Down
4 changes: 2 additions & 2 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ header:
- 'cmake_modules/FindRT.cmake'
- 'cmake_modules/FindDL.cmake'
# Copyright (c) 2017 Guillaume Papin
- 'scripts/run-clang-format.py'
- 'build-support/run-clang-format.py'
# The MIT License (MIT), Copyright (c) 2015 Microsoft Corporation
- 'cmake_modules/BaseFunctions.cmake'
- 'docs/rdsn-README.md'
Expand All @@ -120,7 +120,7 @@ header:
- 'idl/metadata.thrift'
- 'idl/meta_admin.thrift'
- 'idl/replica_admin.thrift'
- 'scripts/compile_thrift.py'
- 'build-support/compile_thrift.py'
- 'scripts/learn_stat.py'
- 'src/runtime/api_layer1.h'
- 'src/runtime/api_task.h'
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ RESULTING FROM THE USE OF THIS SOFTWARE.

--------------------------------------------------------------------------------

scripts/run-clang-format.py - MIT License
build-support/run-clang-format.py - MIT License

MIT License

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def generate_code_in_command_helper_header(replica_counter):


# python3 ./collector_table_counter_gen.py counter1,counter2
# please use `./scripts/format_files.sh` to format after generate code
# please use `./build-support/format_files.sh` to format after generate code
if __name__ == '__main__':
if len(sys.argv) != 2:
print("python3 ./collector_table_counter_gen.py {counter1,counter2..}")
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion java-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ mvn clean package -Dtest=TestPing
### Install

```
cd scripts && bash recompile_thrift.sh && cd -
cd build-support && bash recompile_thrift.sh && cd -
mvn clean install -DskipTests
```

Expand Down
12 changes: 6 additions & 6 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ function run_build()
if [ ! -f "${ROOT}/src/common/serialization_helper/dsn.layer2_types.h" ]; then
echo "Gen thrift"
# TODO(yingchun): should be optimized
python3 $ROOT/scripts/compile_thrift.py
sh ${ROOT}/scripts/recompile_thrift.sh
python3 $ROOT/build-support/compile_thrift.py
sh ${ROOT}/build-support/recompile_thrift.sh
fi

if [ ! -d "$BUILD_DIR" ]; then
Expand Down Expand Up @@ -2094,19 +2094,19 @@ case $cmd in
;;
pack_server)
shift
PEGASUS_ROOT=$ROOT ./scripts/pack_server.sh $*
PEGASUS_ROOT=$ROOT ./build-support/pack_server.sh $*
;;
pack_client)
shift
PEGASUS_ROOT=$ROOT ./scripts/pack_client.sh $*
PEGASUS_ROOT=$ROOT ./build-support/pack_client.sh $*
;;
pack_tools)
shift
PEGASUS_ROOT=$ROOT ./scripts/pack_tools.sh $*
PEGASUS_ROOT=$ROOT ./build-support/pack_tools.sh $*
;;
bump_version)
shift
./scripts/bump_version.sh $*
./build-support/bump_version.sh $*
;;
*)
echo "ERROR: unknown command $cmd"
Expand Down
4 changes: 2 additions & 2 deletions scala-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ NOTE: It requires the Pegasus [onebox](https://pegasus.apache.org/overview/onebo

Build Java dependency at first, then build and test Scala client.
```
cd ${PROJECT_ROOT}/java-client/scripts
./recompile_thrift.sh
cd ${PROJECT_ROOT}/build-support
bash recompile_thrift.sh
cd ${PROJECT_ROOT}/java-client
mvn clean package -DskipTests -Dcheckstyle.skip=true
Expand Down

0 comments on commit d3754b3

Please sign in to comment.