Skip to content

Commit ce1f46e

Browse files
committed
Merge remote-tracking branch 'upstream/master' into petsc_trilinos_and_kokkos
2 parents 0462c29 + 95edf79 commit ce1f46e

File tree

1,697 files changed

+69693
-37794
lines changed

Some content is hidden

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

1,697 files changed

+69693
-37794
lines changed

Diff for: .clang-tidy

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
# - selected modernize-* warnings:
99
# Some of these produce a lot of noise for limited utility.
1010
#
11+
# - performance-enum-size:
12+
# We don't care if an enum could use a smaller base type than
13+
# unsigned int.
14+
#
1115
# - performance-inefficient-string-concatenation:
1216
# We don't care about "a"+to_string(5)+...
1317
#
@@ -33,9 +37,10 @@ Checks: >
3337
-modernize-use-transparent-functors,
3438
mpi-*,
3539
performance-*,
40+
-performance-avoid-endl,
41+
-performance-enum-size,
3642
-performance-inefficient-string-concatenation,
3743
-performance-no-automatic-move,
38-
-performance-avoid-endl,
3944
readability-qualified-auto
4045
4146
WarningsAsErrors: '*'

Diff for: .gitattributes

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ Jenkinsfile export-ignore
1414

1515
/.github/ export-ignore
1616

17+
# exclude most of the testsuite from the tarball:
18+
/tests/* export-ignore
19+
# but keep everything to run the "make test" target (quick_tests, examples):
1720
/tests/CMakeLists.txt -export-ignore
1821
/tests/examples -export-ignore
19-
/tests/* export-ignore
2022
/tests/quick_tests -export-ignore
2123
/tests/run_*.cmake -export-ignore
2224
/tests/scripts -export-ignore

Diff for: .github/workflows/docker.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
if: (github.event_name == 'schedule' && github.repository == 'dealii/dealii') || github.event_name != 'schedule'
2020

2121
name: build master docker ${{ matrix.ubuntu_version }} ${{ matrix.platform }}
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
2323

2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
ubuntu_version: [focal, jammy]
27+
ubuntu_version: [jammy, noble]
2828
platform: [linux/amd64]
2929
# Use only 2 jobs to build, as more jobs
3030
# would starve the github machine for memory.
@@ -93,15 +93,15 @@ jobs:
9393
merge:
9494
if: (github.event_name == 'schedule' && github.repository == 'dealii/dealii') || github.event_name != 'schedule'
9595

96-
runs-on: ubuntu-latest
96+
runs-on: ubuntu-24.04
9797
needs:
9898
- build-master-docker-ubuntu
9999

100100
# Merge all images for a specific ubuntu version
101101
strategy:
102102
fail-fast: false
103103
matrix:
104-
ubuntu_version: [focal, jammy]
104+
ubuntu_version: [jammy, noble]
105105

106106
steps:
107107
- name: Download digests

Diff for: .github/workflows/indent.yml

+21-23
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: indent
33
on: [push, pull_request]
44

55
concurrency:
6-
group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
6+
group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
77
cancel-in-progress: ${{github.event_name == 'pull_request'}}
88

99
permissions:
@@ -14,7 +14,7 @@ jobs:
1414
# run the indent checks
1515

1616
name: indent
17-
runs-on: [ubuntu-22.04]
17+
runs-on: ubuntu-24.04
1818

1919
steps:
2020
- uses: actions/checkout@v4
@@ -31,23 +31,24 @@ jobs:
3131
# build the documentation
3232

3333
name: doxygen
34-
runs-on: [ubuntu-22.04]
34+
runs-on: ubuntu-24.04
35+
36+
env:
37+
MAKEFLAGS: "--jobs=4"
3538

3639
steps:
3740
- name: setup
3841
run: |
3942
sudo apt update
40-
sudo apt install graphviz perl texlive-bibtex-extra
41-
- uses: ssciwr/doxygen-install@v1
42-
with:
43-
version: "1.9.6"
43+
sudo apt install doxygen graphviz perl texlive-bibtex-extra
44+
doxygen --version
4445
- uses: actions/checkout@v4
4546
- name: build documentation
4647
run: |
4748
mkdir build
4849
cd build
4950
cmake -DDEAL_II_COMPONENT_DOCUMENTATION=ON -DDEAL_II_DOXYGEN_USE_MATHJAX=ON ..
50-
make -j 2 documentation
51+
make documentation
5152
- name: check for doxygen errors and warnings
5253
run: |
5354
cd build
@@ -63,24 +64,21 @@ jobs:
6364
sed -i '/^$/d' doxygen.log
6465
# Check if remaining log is zero size
6566
! [ -s doxygen.log ] || exit 1
66-
- name: compress
67-
run: |
68-
tar -czf doxygen_documentation.tar.gz build/doc/doxygen
69-
- name: archive documentation
70-
uses: actions/upload-artifact@v4
67+
- uses: actions/upload-artifact@v4
7168
with:
72-
name: doxygen_documentation.tar.gz
73-
path: doxygen_documentation.tar.gz
69+
name: doxygen_documentation
70+
path: build/doc/doxygen
7471

75-
typos:
76-
# check for typos
72+
pre-commit:
73+
# run pre-commit checks
7774

78-
name: typos
79-
runs-on: [ubuntu-22.04]
75+
name: pre-commit
76+
runs-on: ubuntu-24.04
77+
78+
env:
79+
SKIP: clang-format, no-commit-to-branch
8080

8181
steps:
8282
- uses: actions/checkout@v4
83-
- uses: crate-ci/[email protected]
84-
with:
85-
files: doc examples include source tests
86-
config: ./.typos.toml
83+
- run: python -m pip install networkx
84+
- uses: pre-commit/[email protected]

0 commit comments

Comments
 (0)