Browse Source

auto code-format bot and disable restyled (#3075)

tags/20210720
nihui GitHub 4 years ago
parent
commit
b413fd3a3d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 7 deletions
  1. +52
    -0
      .github/workflows/code-format.yml
  2. +1
    -1
      .restyled.yaml
  3. +6
    -3
      src/simpleocv.h
  4. +3
    -3
      tests/test_packing.cpp

+ 52
- 0
.github/workflows/code-format.yml View File

@@ -0,0 +1,52 @@
name: code-format

on: [push, pull_request, pull_request_target]

jobs:
code-format:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

- name: cache-clang-format
id: cache-clang-format
uses: actions/cache@v2.1.6
with:
path: clang-format-install
key: clang-format-install-4
- name: clang-format
if: steps.cache-clang-format.outputs.cache-hit != 'true'
run: |
wget https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/llvm-project-10.0.1.tar.xz
tar -xf llvm-project-10.0.1.tar.xz
cd llvm-project-10.0.1
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_PROJECTS="clang" -DLLVM_TARGETS_TO_BUILD="" -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_DOCS=OFF ../llvm/
make -j2 clang-format
mkdir $GITHUB_WORKSPACE/clang-format-install
cp -r bin/clang-format $GITHUB_WORKSPACE/clang-format-install
cd ../../
rm -rf llvm-project-10.0.1
rm llvm-project-10.0.1.tar.xz

- name: astyle
run: |
sudo apt-get update
sudo apt-get install -y astyle

- name: code-format
run: |
mkdir -p ~/bin
mv $GITHUB_WORKSPACE/clang-format-install/clang-format ~/bin/clang-format
rm -rf $GITHUB_WORKSPACE/clang-format-install
export PATH=~/bin:$PATH
sh codeformat.sh
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: apply code-format changes

- name: restore-clang-format-cache
run: |
mkdir $GITHUB_WORKSPACE/clang-format-install
cp -r ~/bin/clang-format $GITHUB_WORKSPACE/clang-format-install

+ 1
- 1
.restyled.yaml View File

@@ -1,6 +1,6 @@
# See https://github.com/restyled-io/restyled.io/wiki/Configuring-Restyled

enabled: true
enabled: false

pull_requests: true



+ 6
- 3
src/simpleocv.h View File

@@ -124,7 +124,8 @@ struct Point_
{
}

template<typename _Tp2> operator Point_<_Tp2>() const
template<typename _Tp2>
operator Point_<_Tp2>() const
{
return Point_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y));
}
@@ -148,7 +149,8 @@ struct Size_
{
}

template<typename _Tp2> operator Size_<_Tp2>() const
template<typename _Tp2>
operator Size_<_Tp2>() const
{
return Size_<_Tp2>(saturate_cast<_Tp2>(width), saturate_cast<_Tp2>(height));
}
@@ -176,7 +178,8 @@ struct Rect_
{
}

template<typename _Tp2> operator Rect_<_Tp2>() const
template<typename _Tp2>
operator Rect_<_Tp2>() const
{
return Rect_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y), saturate_cast<_Tp2>(width), saturate_cast<_Tp2>(height));
}


+ 3
- 3
tests/test_packing.cpp View File

@@ -601,7 +601,7 @@ static int test_packing_0()
|| test_packing_gpu_image2buffer(a, 4, 8)
|| test_packing_gpu_image2buffer(a, 8, 4)
#endif // NCNN_VULKAN
;
;
}

static int test_packing_1()
@@ -656,7 +656,7 @@ static int test_packing_1()
|| test_packing_gpu_image2buffer(a, 4, 8)
|| test_packing_gpu_image2buffer(a, 8, 4)
#endif // NCNN_VULKAN
;
;
}

static int test_packing_2()
@@ -711,7 +711,7 @@ static int test_packing_2()
|| test_packing_gpu_image2buffer(a, 4, 8)
|| test_packing_gpu_image2buffer(a, 8, 4)
#endif // NCNN_VULKAN
;
;
}

int main()


Loading…
Cancel
Save