Skip to content

Commit

Permalink
Merge branch 'development' into BenWibking/new-shock-cloud
Browse files Browse the repository at this point in the history
  • Loading branch information
BenWibking authored Jan 22, 2024
2 parents 1120822 + 8b02395 commit 0a06466
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy-comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: ZedThree/clang-tidy-review/post@v0.15.1
- uses: ZedThree/clang-tidy-review/post@v0.17.0
# lgtm_comment_body, max_comments, and annotations need to be set on the posting workflow in a split setup
with:
# adjust options as necessary
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
submodules: true
fetch-depth: 0

- uses: ZedThree/clang-tidy-review@v0.15.1
- uses: ZedThree/clang-tidy-review@v0.17.0
id: review
with:
config_file: src/.clang-tidy
Expand All @@ -27,7 +27,7 @@ jobs:
split_workflow: true

# Uploads an artefact containing clang_fixes.json
- uses: ZedThree/clang-tidy-review/upload@v0.15.1
- uses: ZedThree/clang-tidy-review/upload@v0.17.0

# If there are any comments, fail the check
- if: steps.review.outputs.total_comments > 0
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ jobs:
working-directory: ${{runner.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
# Restrict to 1 build process at a time to avoid OOM kills.
run: cmake --build . --config $BUILD_TYPE --parallel 1
run: cmake --build . --config $BUILD_TYPE --parallel 4

- name: Create test output directory
run: cmake -E make_directory $GITHUB_WORKSPACE/tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
python-version: '3.10'

- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
# this path is specific to Ubuntu
path: ~/.cache/pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Python and HDF5 dependencies
run: sudo apt-get update && sudo apt-get install python3-dev python3-numpy python3-matplotlib python3-pip libhdf5-mpi-dev
- name: Set Up Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/ccache
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
Expand Down

0 comments on commit 0a06466

Please sign in to comment.