diff --git a/.github/actions/action-sh-checker b/.github/actions/action-sh-checker deleted file mode 160000 index 76ab0b22e1f194e..000000000000000 --- a/.github/actions/action-sh-checker +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76ab0b22e1f194e4a582edc7969df6485c4e9246 diff --git a/.github/actions/clang-format-lint-action b/.github/actions/clang-format-lint-action deleted file mode 160000 index 6adbe14579e5b8e..000000000000000 --- a/.github/actions/clang-format-lint-action +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6adbe14579e5b8e19eb3e31e5ff2479f3bd302c7 diff --git a/.github/actions/clang-tidy-review b/.github/actions/clang-tidy-review deleted file mode 160000 index 2c55ef8cfc9acb3..000000000000000 --- a/.github/actions/clang-tidy-review +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2c55ef8cfc9acb3715d433e58aea086dcec9b206 diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index f69cb953683895c..c804b753a3bbc41 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -31,14 +31,21 @@ jobs: uses: actions/checkout@v3 with: persist-credentials: false - submodules: recursive - name: Checkout ${{ github.ref }} ( ${{ github.event.pull_request.head.sha }} ) if: ${{ github.event_name == 'pull_request_target' }} uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} - submodules: recursive + + - name: Checkout paths-filter + run: | + rm -rf ./.github/actions/paths-filter + git clone https://github.com/dorny/paths-filter .github/actions/paths-filter + + pushd .github/actions/paths-filter &>/dev/null + git checkout 4512585405083f25c027a35db413c2b3b9006d50 + popd &>/dev/null - name: Paths filter uses: ./.github/actions/paths-filter @@ -49,6 +56,15 @@ jobs: - 'be/src/**' - 'be/test/**' + - name: Checkout clang-format-lint-action + run: | + rm -rf ./.github/actions/clang-format-lint-action + git clone https://github.com/DoozyX/clang-format-lint-action .github/actions/clang-format-lint-action + + pushd .github/actions/clang-format-lint-action &>/dev/null + git checkout 6adbe14579e5b8e19eb3e31e5ff2479f3bd302c7 + popd &>/dev/null + - name: "Format it!" if: ${{ steps.filter.outputs.be_changes == 'true' }} uses: ./.github/actions/clang-format-lint-action diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 652aa7f81ea861f..9e314bfb6dfc25e 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -27,21 +27,22 @@ jobs: - name: Checkout ${{ github.ref }} ( ${{ github.sha }} ) if: ${{ github.event_name != 'pull_request_target' }} uses: actions/checkout@v3 - with: - submodules: recursive - name: Checkout ${{ github.ref }} ( ${{ github.event.pull_request.head.sha }} ) if: ${{ github.event_name == 'pull_request_target' }} uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} - submodules: recursive - - name: Patch + - name: Checkout action-sh-checker run: | - pushd .github/actions/action-sh-checker >/dev/null + rm -rf ./.github/actions/action-sh-checker + git clone https://github.com/luizm/action-sh-checker .github/actions/action-sh-checker + + pushd .github/actions/action-sh-checker &>/dev/null + git checkout 76ab0b22e1f194e4a582edc7969df6485c4e9246 sed -i 's/\[ "$GITHUB_EVENT_NAME" == "pull_request" \]/\[\[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "pull_request_target" \]\]/' entrypoint.sh - popd >/dev/null + popd &>/dev/null - name: Run ShellCheck uses: ./.github/actions/action-sh-checker @@ -63,7 +64,15 @@ jobs: uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} - submodules: recursive + + - name: Checkout paths-filter + run: | + rm -rf ./.github/actions/paths-filter + git clone https://github.com/dorny/paths-filter .github/actions/paths-filter + + pushd .github/actions/paths-filter &>/dev/null + git checkout 4512585405083f25c027a35db413c2b3b9006d50 + popd &>/dev/null - name: Paths Filter uses: ./.github/actions/paths-filter @@ -117,7 +126,6 @@ jobs: uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} - submodules: recursive - name: Download uses: actions/download-artifact@v3 @@ -125,6 +133,15 @@ jobs: name: compile_commands path: ./be/build_Release + - name: Checkout clang-tidy review + run: | + rm -rf ./.github/actions/clang-tidy-review + git clone https://github.com/ZedThree/clang-tidy-review .github/actions/clang-tidy-review + + pushd .github/actions/clang-tidy-review &>/dev/null + git checkout 2c55ef8cfc9acb3715d433e58aea086dcec9b206 + popd &>/dev/null + - name: Run clang-tidy review uses: ./.github/actions/clang-tidy-review id: review diff --git a/.github/workflows/license-eyes.yml b/.github/workflows/license-eyes.yml index 823ac845b3b0c17..890efb2d9d11962 100644 --- a/.github/workflows/license-eyes.yml +++ b/.github/workflows/license-eyes.yml @@ -30,15 +30,12 @@ jobs: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" if: ${{ github.event_name != 'pull_request_target' }} uses: actions/checkout@v3 - with: - submodules: recursive - name: Checkout ${{ github.ref }} ( ${{ github.event.pull_request.head.sha }} ) if: ${{ github.event_name == 'pull_request_target' }} uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} - submodules: recursive - name: Check License uses: apache/skywalking-eyes@v0.2.0 diff --git a/.gitmodules b/.gitmodules index 9fe51bfd1d056de..a4e579b1794833d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule ".github/actions/get-workflow-origin"] path = .github/actions/get-workflow-origin url = https://github.com/potiuk/get-workflow-origin.git -[submodule ".github/actions/clang-format-lint-action"] - path = .github/actions/clang-format-lint-action - url = https://github.com/DoozyX/clang-format-lint-action.git [submodule ".github/actions/setup-maven"] path = .github/actions/setup-maven url = https://github.com/stCarolas/setup-maven.git @@ -19,12 +16,6 @@ [submodule ".github/actions/ccache-action"] path = .github/actions/ccache-action url = https://github.com/hendrikmuhs/ccache-action -[submodule ".github/actions/action-sh-checker"] - path = .github/actions/action-sh-checker - url = https://github.com/luizm/action-sh-checker -[submodule ".github/actions/clang-tidy-review"] - path = .github/actions/clang-tidy-review - url = https://github.com/ZedThree/clang-tidy-review.git [submodule "be/src/apache-orc"] path = be/src/apache-orc url = https://github.com/apache/doris-thirdparty.git