Skip to content

Commit fd03655

Browse files
gardner48gardner48
authored
Merge branch 'develop' into maintenance/deprecate-monitor-fn
2 parents 20efda5 + 8e21530 commit fd03655

File tree

2,635 files changed

+40267
-10398
lines changed

Some content is hidden

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

2,635 files changed

+40267
-10398
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Build and Test
2+
3+
on:
4+
# Allows this workflow to be called by other workflows
5+
workflow_call:
6+
# Allows manual triggering
7+
workflow_dispatch:
8+
9+
# Cancel any in-progress workflow runs
10+
concurrency:
11+
group: build-and-test-${{ github.head_ref || github.ref_name }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
macos-latest:
19+
uses: ./.github/workflows/macos-latest.yml
20+
21+
address-sanitizer:
22+
uses: ./.github/workflows/test-address-sanitizer.yml
23+
24+
ubuntu-latest-clang:
25+
uses: ./.github/workflows/ubuntu-latest-clang.yml
26+
27+
ubuntu-latest-oneapi:
28+
uses: ./.github/workflows/ubuntu-latest-oneapi.yml
29+
30+
ubuntu-latest-gcc:
31+
uses: ./.github/workflows/ubuntu-latest.yml
32+
33+
windows-latest-intel:
34+
uses: ./.github/workflows/windows-latest-intel.yml
35+
36+
windows-latest-mingw:
37+
uses: ./.github/workflows/windows-latest-mingw.yml
38+
39+
windows-latest-msvc:
40+
uses: ./.github/workflows/windows-latest.yml

‎.github/workflows/build-ci-containers-e4s.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v6
2222
- name: Set up QEMU
23-
uses: docker/setup-qemu-action@v2
23+
uses: docker/setup-qemu-action@v4
2424
- name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@v3
25+
uses: docker/setup-buildx-action@v4
2626
- name: Login to container registry
27-
uses: docker/login-action@v3
27+
uses: docker/login-action@v4
2828
with:
2929
registry: ghcr.io
3030
username: ${{ github.actor }}
3131
password: ${{ secrets.GITHUB_TOKEN }}
3232
- name: Build and push Docker images
33-
uses: docker/build-push-action@v6.18.0
33+
uses: docker/build-push-action@v7.0.0
3434
with:
3535
context: "./docker/sundials-ci/e4s-base"
3636
build-args: e4s_version=22.05
@@ -50,17 +50,17 @@ jobs:
5050
- name: Checkout
5151
uses: actions/checkout@v6
5252
- name: Set up QEMU
53-
uses: docker/setup-qemu-action@v2
53+
uses: docker/setup-qemu-action@v4
5454
- name: Set up Docker Buildx
55-
uses: docker/setup-buildx-action@v3
55+
uses: docker/setup-buildx-action@v4
5656
- name: Login to container registry
57-
uses: docker/login-action@v3
57+
uses: docker/login-action@v4
5858
with:
5959
registry: ghcr.io
6060
username: ${{ github.actor }}
6161
password: ${{ secrets.GITHUB_TOKEN }}
6262
- name: Build and push Docker images
63-
uses: docker/build-push-action@v6.18.0
63+
uses: docker/build-push-action@v7.0.0
6464
with:
6565
context: "./docker/sundials-ci/e4s-quarterly"
6666
build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

‎.github/workflows/build-ci-containers-nightly.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ jobs:
2222
- name: Checkout
2323
uses: actions/checkout@v6
2424
- name: Set up QEMU
25-
uses: docker/setup-qemu-action@v2
25+
uses: docker/setup-qemu-action@v4
2626
- name: Set up Docker Buildx
27-
uses: docker/setup-buildx-action@v3
27+
uses: docker/setup-buildx-action@v4
2828
- name: Login to container registry
29-
uses: docker/login-action@v3
29+
uses: docker/login-action@v4
3030
with:
3131
registry: ghcr.io
3232
username: ${{ github.actor }}
3333
password: ${{ secrets.GITHUB_TOKEN }}
3434
- name: Build and push Docker images
35-
uses: docker/build-push-action@v6.18.0
35+
uses: docker/build-push-action@v7.0.0
3636
with:
3737
context: "./docker/sundials-ci/spack-nightly"
3838
build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

‎.github/workflows/check-format.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
name: Checks - formatting
22

33
on:
4-
pull_request:
4+
# Allows this workflow to be called by other workflows
5+
workflow_call:
6+
# Allows manual triggering
57
workflow_dispatch:
68

9+
# Cancel any in-progress workflow runs
710
concurrency:
8-
group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
11+
group: format-${{ github.head_ref || github.ref_name }}
912
cancel-in-progress: true
1013

14+
permissions:
15+
contents: read
16+
1117
jobs:
1218
format_check:
1319
runs-on: ubuntu-latest
@@ -19,6 +25,12 @@ jobs:
1925
apt update
2026
apt install -y git python3-pip
2127
28+
- name: Install codespell
29+
run: pip install codespell
30+
31+
- name: Print codespell version
32+
run: codespell --version
33+
2234
- name: Install black
2335
run: pip install black
2436

@@ -46,7 +58,11 @@ jobs:
4658
- name: Add safe directory
4759
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
4860

49-
- name: Run checker on code
61+
- name: Run spelling checks
62+
run: |
63+
./scripts/spelling.sh
64+
65+
- name: Run formatting checks
5066
run: |
5167
./scripts/format.sh .
5268
@@ -58,7 +74,7 @@ jobs:
5874
run: /usr/bin/git diff > format.patch
5975

6076
- name: Archive diff as a patch if we failed
61-
uses: actions/upload-artifact@v6
77+
uses: actions/upload-artifact@v7
6278
if: failure()
6379
with:
6480
name: format.patch

‎.github/workflows/check-litgen.yml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
name: Checks - litgen
2+
3+
on:
4+
# Allows this workflow to be called by other workflows
5+
workflow_call:
6+
# Allows manual triggering
7+
workflow_dispatch:
8+
9+
# Cancel any in-progress workflow runs
10+
concurrency:
11+
group: litgen-${{ github.head_ref || github.ref_name }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
litgen_check:
19+
runs-on: ubuntu-latest
20+
container:
21+
image: ghcr.io/llnl/sundials_spack_cache:llvm-17.0.4-h4lflucc3v2vage45opbo2didtcuigsn.spack
22+
steps:
23+
- name: Install dependencies with apt
24+
run: |
25+
apt update
26+
apt-get update && apt-get install --no-install-recommends -y \
27+
ca-certificates \
28+
ccache \
29+
cpio \
30+
curl \
31+
dpkg-dev \
32+
default-jdk \
33+
file \
34+
g++ \
35+
git \
36+
libarchive-dev \
37+
libcurl4-openssl-dev \
38+
libxml2-dev \
39+
libxml2-utils \
40+
libxslt1-dev \
41+
make \
42+
man \
43+
ninja-build \
44+
python3 \
45+
python3-dev \
46+
python3-pip \
47+
tree \
48+
valgrind \
49+
zip \
50+
&& apt-get clean \
51+
&& rm -rf /var/lib/apt/lists/*
52+
53+
- name: Install black
54+
run: pip install black
55+
56+
- name: Print black version
57+
run: black --version
58+
59+
- name: Install cmake-format
60+
run: pip install cmakelang
61+
62+
- name: Print cmake-format version
63+
run: cmake-format --version
64+
65+
- name: Install fprettify
66+
run: pip install fprettify
67+
68+
- name: Print fprettify version
69+
run: fprettify --version
70+
71+
- name: Print clang-format version
72+
run: clang-format --version
73+
74+
- name: Install sundials generator+litgen
75+
run: |
76+
pip install black isort pyyaml pybind11 litgen@git+https://github.com/sundials-codes/litgen.git
77+
78+
- name: Check out repository code
79+
uses: actions/checkout@v6
80+
with:
81+
submodules: true
82+
83+
- name: Add safe directory
84+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
85+
86+
- name: Run generator on code
87+
run: |
88+
cd bindings/sundials4py
89+
python3 sundials4py-generate/generate.py .
90+
91+
- name: Run formatter on code
92+
run: ./scripts/format.sh bindings/sundials4py
93+
94+
- name: Run git diff to see if anything changed
95+
run: /usr/bin/git diff --exit-code
96+
97+
- name: Run git diff if we failed
98+
if: failure()
99+
run: /usr/bin/git diff > litgen.patch
100+
101+
- name: Archive diff as a patch if we failed
102+
uses: actions/upload-artifact@v7
103+
if: failure()
104+
with:
105+
name: litgen.patch
106+
path: |
107+
${{ github.workspace }}/litgen.patch

‎.github/workflows/check-spelling.yml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎.github/workflows/check-swig.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
name: Checks - swig
22

33
on:
4-
pull_request:
4+
# Allows this workflow to be called by other workflows
5+
workflow_call:
6+
# Allows manual triggering
57
workflow_dispatch:
68

9+
# Cancel any in-progress workflow runs
710
concurrency:
8-
group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
11+
group: swig-${{ github.head_ref || github.ref_name }}
912
cancel-in-progress: true
1013

14+
permissions:
15+
contents: read
16+
1117
jobs:
1218
swig_check:
1319
runs-on: ubuntu-latest
@@ -46,7 +52,7 @@ jobs:
4652
run: /usr/bin/git diff > swig.patch
4753

4854
- name: Archive diff as a patch if we failed
49-
uses: actions/upload-artifact@v6
55+
uses: actions/upload-artifact@v7
5056
if: failure()
5157
with:
5258
name: swig.patch

0 commit comments

Comments
 (0)