Skip to content

Commit 7810c8f

Browse files
committed
Merge commit '985c3a9e7343c2f612560024cae4d968f800c8ac' into jgfouca/block_sptrsv2
* commit '985c3a9e7343c2f612560024cae4d968f800c8ac': Propose increasing column limit to 120. (kokkos#2255) Bump github/codeql-action from 3.25.11 to 3.25.12 (kokkos#2278) Bump actions/dependency-review-action from 4.3.3 to 4.3.4 (kokkos#2279)
2 parents 92eca0f + 985c3a9 commit 7810c8f

File tree

875 files changed

+51727
-85614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

875 files changed

+51727
-85614
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ SortIncludes: false
44
AlignConsecutiveAssignments: true
55
AllowShortCaseLabelsOnASingleLine: true
66
AllowShortIfStatementsOnASingleLine: true
7+
ColumnLimit: 120

.git-blame-ignore-revs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#
2+
# Add formatting and other uninteresting commits here and
3+
# 'git blame $file' will skip them IF
4+
# A) you have it configured to do so globally (dangerous, this will break git blame on repos that don't have a .git-blame-ignore-revs file.
5+
# git config --global blame.ignoreRevsFile .git-blame-ignore-revs
6+
# OR
7+
# B) you have it configured to do so locally (tedious, you have to remember to do this in every KK clone)
8+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
9+
# OR
10+
# C) you have an aliased blame command for KokkosKernels:
11+
# git config --global alias.kkblame 'blame --ignore-revs-file=.git-blame-ignore-revs'
12+
# NOTE: this implies you run 'git kkblame $file'
13+
# OR
14+
# D) you explicitly tell blame to skip them
15+
# git blame --ignore-revs-file=.git-blame-ignore-revs $file
16+
#
17+
# List skips here:

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
47+
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
4848
with:
4949
languages: c-cpp
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -100,6 +100,6 @@ jobs:
100100
run: make -j2
101101

102102
- name: Perform CodeQL Analysis
103-
uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
103+
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
104104
with:
105105
category: "/language:c-cpp"

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
- name: 'Checkout Repository'
2525
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2626
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3
27+
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4

.github/workflows/format.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ permissions:
1111

1212
jobs:
1313
clang-format-check:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1717

1818
- name: Install Dependencies
19-
run: sudo apt install clang-format-8
19+
run: sudo apt install clang-format-16
2020

2121
- name: check
2222
run: |
@@ -26,7 +26,7 @@ jobs:
2626
# For every file changed, apply clang-format
2727
for file in $(git diff --name-only origin/$GITHUB_BASE_REF | egrep '.*\.cpp$|.*\.hpp$|.*\.h$'); do
2828
if [ -e $file ]; then
29-
clang-format-8 -i -style=file $file
29+
clang-format-16 -i -style=file $file
3030
git add $file
3131
fi
3232
done

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ jobs:
7373

7474
# Upload the results to GitHub's code scanning dashboard.
7575
- name: "Upload to code-scanning"
76-
uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
76+
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
7777
with:
7878
sarif_file: results.sarif

0 commit comments

Comments
 (0)