Skip to content

Commit 77b67e8

Browse files
committed
merge
2 parents 24e3432 + 77007b4 commit 77b67e8

1 file changed

Lines changed: 35 additions & 57 deletions

File tree

.github/workflows/code_style.yml

Lines changed: 35 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -15,47 +15,14 @@ concurrency:
1515
permissions: read-all
1616

1717
jobs:
18-
Smart_CI:
19-
runs-on: ubuntu-latest
20-
if: github.event.pull_request.draft == false || github.run_attempt > 1
21-
outputs:
22-
affected_components: "${{ steps.smart_ci.outputs.affected_components }}"
23-
changed_components: "${{ steps.smart_ci.outputs.changed_components }}"
24-
skip_workflow: "${{ steps.smart_ci.outputs.skip_workflow }}"
25-
steps:
26-
- name: checkout action
27-
uses: ababushk/checkout@dd591a6a2ac25618db4eda86e7e0d938f88cf01b # cherry_pick_retries
28-
timeout-minutes: 15
29-
with:
30-
sparse-checkout: .github/actions/smart-ci
31-
32-
- name: Get affected components
33-
id: smart_ci
34-
uses: ./.github/actions/smart-ci
35-
with:
36-
repository: ${{ github.repository }}
37-
pr: ${{ github.event.number }}
38-
commit_sha: ${{ github.sha }}
39-
ref_name: ${{ github.ref_name }}
40-
component_pattern: "category: (.*)"
41-
repo_token: ${{ secrets.GITHUB_TOKEN }}
42-
skip_when_only_listed_labels_set: 'docs'
43-
skip_when_only_listed_files_changed: '*.md,*.rst,*.png,*.jpg,*.svg'
44-
45-
- name: Show affected components
46-
run: |
47-
echo "${{ toJSON(steps.smart_ci.outputs.affected_components) }}"
48-
shell: bash
49-
50-
Docker:
51-
needs: Smart_CI
52-
runs-on: aks-linux-4-cores-16gb-docker-build
53-
container:
54-
image: openvinogithubactions.azurecr.io/docker_build:0.2
55-
volumes:
56-
- /mount:/mount
57-
outputs:
58-
images: "${{ steps.handle_docker.outputs.images }}"
18+
clang-format:
19+
runs-on: ubuntu-22.04
20+
if: ${{ github.repository_owner == 'openvinotoolkit' }}
21+
permissions:
22+
contents: read
23+
checks: write
24+
issues: write
25+
pull-requests: write
5926
steps:
6027
- name: Checkout
6128
uses: ababushk/checkout@dd591a6a2ac25618db4eda86e7e0d938f88cf01b # cherry_pick_retries
@@ -98,7 +65,9 @@ jobs:
9865
if: startsWith(github.event_name, 'pull_request')
9966
uses: reviewdog/action-suggester@4747dbc9f9e37adba0943e681cc20db466642158 # v1.19.0
10067
with:
101-
github_token: ${{ secrets.GITHUB_TOKEN }}
68+
github_token: ${{ github.token }}
69+
tool_name: "clang-format"
70+
reviewdog_flags: -reporter=github-pr-review
10271
level: warning
10372
fail_level: error
10473
filter_mode: nofilter
@@ -135,14 +104,14 @@ jobs:
135104
fail_level: error
136105
filter_mode: nofilter
137106

138-
clang-format-riscv64:
139-
needs: Docker
140-
runs-on: aks-linux-4-cores-16gb
141-
container:
142-
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_24_04_x64_code_style }}
143-
volumes:
144-
- /mount:/mount
145-
options: --user 1001 # We use standard github-actions user inside container to avoid permission issues after checkout
107+
ShellCheck:
108+
runs-on: ubuntu-22.04
109+
if: ${{ github.repository_owner == 'openvinotoolkit' }}
110+
permissions:
111+
contents: read
112+
checks: write
113+
issues: write
114+
pull-requests: write
146115
steps:
147116
- uses: ababushk/checkout@dd591a6a2ac25618db4eda86e7e0d938f88cf01b # cherry_pick_retries
148117
timeout-minutes: 15
@@ -180,22 +149,22 @@ jobs:
180149

181150
- name: CMake configure
182151
run: cmake -B build
152+
#
153+
# - name: Shellcheck cmake target
154+
# run: cmake --build build --target ov_shellcheck -j8
183155

184-
- name: Shellcheck cmake target
185-
run: cmake --build build --target ov_shellcheck -j8
186-
187-
# always provide suggestions even for skipped scripts in ov_shellcheck tagret
156+
# always provide suggestions even for skipped scripts in ov_shellcheck target
188157
- name: ShellCheck action
189158
if: always()
190159
uses: reviewdog/action-shellcheck@4c07458293ac342d477251099501a718ae5ef86e # v1.32.0
191160
with:
192-
level: style
193161
reporter: github-pr-review
194162
check_all_files_with_shebangs: true
195163
fail_level: error
196164
exclude: |
197165
"*/thirdparty/*"
198166
"./temp/*"
167+
"*/.git/*"
199168
200169
NamingConventionCheck:
201170
needs: Docker
@@ -215,7 +184,16 @@ jobs:
215184
run: python3 -m pip install -r cmake/developer_package/ncc_naming_style/requirements_dev.txt
216185

217186
- name: CMake configure
218-
run: cmake -B build
187+
run: cmake -DENABLE_NCC_STYLE=ON -B build
219188

220189
- name: Naming convention check
221-
run: cmake --build build --target ncc_all -j8
190+
run: cmake --build build --target ncc_all -j8
191+
192+
- name: suggester / Naming Convention
193+
if: always()
194+
uses: reviewdog/action-suggester@v1
195+
with:
196+
github_token: ${{ github.token }}
197+
reviewdog_flags: -reporter=github-pr-review
198+
level: error
199+
fail_on_error: true

0 commit comments

Comments
 (0)