Skip to content

Commit 261442e

Browse files
committed
Merge branch 'next' of https://github.com/boutproject/BOUT-dev into fci-auto-with-debug-higher-order
2 parents 35206d4 + 7bbf7f3 commit 261442e

10 files changed

Lines changed: 603 additions & 56 deletions

File tree

.ci_fedora.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ then
4141
# Ignore weak depencies
4242
echo "install_weak_deps=False" >> /etc/dnf/dnf.conf
4343
echo "minrate=10M" >> /etc/dnf/dnf.conf
44+
export FORCE_COLUMNS=200
4445
time dnf -y install dnf5
4546
time dnf5 -y install dnf5-plugins cmake python3-zoidberg python3-natsort wget
4647
# Allow to override packages - see #2073

.github/workflows/clang-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Run clang-format
2424
id: format
25-
run: git clang-format origin/${{ github.base_ref }}
25+
run: git clang-format origin/${{ github.base_ref }} || :
2626

2727
- name: Commit to the PR branch
2828
uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/clang-tidy-review.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ jobs:
2222
submodules: true
2323

2424
- name: Run clang-tidy
25-
uses: ZedThree/clang-tidy-review@v0.19.0
25+
uses: ZedThree/clang-tidy-review@v0.20.1
2626
id: review
2727
with:
28-
annotations: true
2928
build_dir: build
3029
apt_packages: "libfftw3-dev,libnetcdf-c++4-dev,libopenmpi-dev,petsc-dev,slepc-dev,liblapack-dev,libparpack2-dev,libsundials-dev,uuid-dev"
3130
config_file: ".clang-tidy"
@@ -48,4 +47,4 @@ jobs:
4847
-DBOUT_UPDATE_GIT_SUBMODULE=OFF
4948
5049
- name: Upload clang-tidy fixes
51-
uses: ZedThree/clang-tidy-review/upload@v0.19.0
50+
uses: ZedThree/clang-tidy-review/upload@v0.20.1

0 commit comments

Comments
 (0)