Skip to content

Commit

Permalink
Merge commit '985c3a9e7343c2f612560024cae4d968f800c8ac' into jgfouca/…
Browse files Browse the repository at this point in the history
…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)
  • Loading branch information
jgfouca committed Jul 29, 2024
2 parents 92eca0f + 985c3a9 commit 7810c8f
Show file tree
Hide file tree
Showing 875 changed files with 51,727 additions and 85,614 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ SortIncludes: false
AlignConsecutiveAssignments: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: true
ColumnLimit: 120
17 changes: 17 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# Add formatting and other uninteresting commits here and
# 'git blame $file' will skip them IF
# 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.
# git config --global blame.ignoreRevsFile .git-blame-ignore-revs
# OR
# B) you have it configured to do so locally (tedious, you have to remember to do this in every KK clone)
# git config blame.ignoreRevsFile .git-blame-ignore-revs
# OR
# C) you have an aliased blame command for KokkosKernels:
# git config --global alias.kkblame 'blame --ignore-revs-file=.git-blame-ignore-revs'
# NOTE: this implies you run 'git kkblame $file'
# OR
# D) you explicitly tell blame to skip them
# git blame --ignore-revs-file=.git-blame-ignore-revs $file
#
# List skips here:
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
with:
category: "/language:c-cpp"
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: 'Dependency Review'
uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
6 changes: 3 additions & 3 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ permissions:

jobs:
clang-format-check:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Install Dependencies
run: sudo apt install clang-format-8
run: sudo apt install clang-format-16

- name: check
run: |
Expand All @@ -26,7 +26,7 @@ jobs:
# For every file changed, apply clang-format
for file in $(git diff --name-only origin/$GITHUB_BASE_REF | egrep '.*\.cpp$|.*\.hpp$|.*\.h$'); do
if [ -e $file ]; then
clang-format-8 -i -style=file $file
clang-format-16 -i -style=file $file
git add $file
fi
done
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ jobs:

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

0 comments on commit 7810c8f

Please sign in to comment.