Skip to content

Commit 313f600

Browse files
authored
Merge pull request github#11214 from erik-krogh/oneFormatToRuleThemAll
CI: remove langauge specific format checks
2 parents ecd8921 + 866e925 commit 313f600

File tree

4 files changed

+2
-31
lines changed

4 files changed

+2
-31
lines changed

.github/workflows/compile-queries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
channel: 'release'
4848
- name: check formatting
49-
run: codeql query format */ql/{src,lib,test}/**/*.{qll,ql} --check-only
49+
run: codeql query format */ql/**/*.{qll,ql} --check-only
5050
- name: compile queries - check-only
5151
# run with --check-only if running in a PR (github.sha != main)
5252
if : ${{ github.event_name == 'pull_request' }}

.github/workflows/js-ml-tests.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,6 @@ defaults:
2323
working-directory: javascript/ql/experimental/adaptivethreatmodeling
2424

2525
jobs:
26-
qlformat:
27-
name: Check QL formatting
28-
runs-on: ubuntu-latest
29-
steps:
30-
- uses: actions/checkout@v3
31-
32-
- uses: ./.github/actions/fetch-codeql
33-
34-
- name: Check QL formatting
35-
run: |
36-
find . "(" -name "*.ql" -or -name "*.qll" ")" -print0 | \
37-
xargs -0 codeql query format --check-only
38-
3926
qlcompile:
4027
name: Check QL compilation
4128
runs-on: ubuntu-latest

.github/workflows/ruby-qltest.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ defaults:
2828
working-directory: ruby
2929

3030
jobs:
31-
qlformat:
32-
runs-on: ubuntu-latest
33-
steps:
34-
- uses: actions/checkout@v3
35-
- uses: ./.github/actions/fetch-codeql
36-
- name: Check QL formatting
37-
run: find ql "(" -name "*.ql" -or -name "*.qll" ")" -print0 | xargs -0 codeql query format --check-only
3831
qlcompile:
3932
runs-on: ubuntu-latest
4033
steps:

.github/workflows/swift.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,4 @@ jobs:
111111
- uses: actions/upload-artifact@v3
112112
with:
113113
name: swift-generated-cpp-files
114-
path: swift/generated-cpp-files/**
115-
qlformat:
116-
runs-on: ubuntu-latest
117-
needs: changes
118-
if: ${{ needs.changes.outputs.ql == 'true' }}
119-
steps:
120-
- uses: actions/checkout@v3
121-
- uses: ./.github/actions/fetch-codeql
122-
- name: Check QL formatting
123-
run: find swift/ql "(" -name "*.ql" -or -name "*.qll" ")" -print0 | xargs -0 codeql query format --check-only
114+
path: swift/generated-cpp-files/**

0 commit comments

Comments
 (0)