Skip to content

Commit 1b092a5

Browse files
committed
Merge branch 'master' into coverity
2 parents 6cf9369 + 76442f8 commit 1b092a5

File tree

164 files changed

+2829
-1868
lines changed

Some content is hidden

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

164 files changed

+2829
-1868
lines changed

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
53+
uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
5454
with:
5555
languages: ${{ matrix.language }}
5656
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
6060
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6161
# If this step fails, then you should remove it and run the build manually (see below)
6262
- name: Autobuild
63-
uses: github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
63+
uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
6464

6565
# ℹ️ Command-line programs to run using the OS shell.
6666
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
7373
# ./location_of_script_within_repo/buildscript.sh
7474

7575
- name: Perform CodeQL Analysis
76-
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
76+
uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
7777
with:
7878
category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
- name: 'Checkout Repository'
2525
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0
27+
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1

.github/workflows/docker-exodus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
username: ${{ secrets.DOCKERHUB_USERNAME }}
2727
password: ${{ secrets.DOCKERHUB_TOKEN }}
2828
- name: Docker build and push
29-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
29+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
3030
with:
3131
context: docker/exodus
3232
push: true

.github/workflows/docker-seacas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
username: ${{ secrets.DOCKERHUB_USERNAME }}
2727
password: ${{ secrets.DOCKERHUB_TOKEN }}
2828
- name: Docker build and push
29-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
29+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
3030
with:
3131
context: docker/seacas
3232
push: true

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
persist-credentials: false
4242

4343
- name: "Run analysis"
44-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
44+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
4545
with:
4646
results_file: results.sarif
4747
results_format: sarif
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
74+
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
7575
with:
7676
sarif_file: results.sarif

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ libraries using the `install-tpl.sh` script, or you can install them
4949
manually as detailed in
5050
[TPL-Manual-Install.md](TPL-Manual-Install.md).
5151

52-
* The script requires bash and wget, which you may need to install.
52+
* The script requires bash and curl, which you may need to install.
5353
* To use the script, simply type `bash ./install-tpl.sh`.
5454
* The default behavior can be modified via a few environment variables:
5555

@@ -285,7 +285,7 @@ recommended to use as current an MPI library as possible.
285285

286286
* Automake is used to configure some of the TPL builds
287287

288-
* wget is needed to download some of the TPL library source code.
288+
* curl is needed to download some of the TPL library source code.
289289

290290
* python is required to use the `exodus.py` and `exomerge.py`
291291
Python interfaces to Exodus databases. Python3 is recommended.
@@ -323,6 +323,9 @@ mingw-w64-x86_64-cmake mingw-w64-x86_64-fmt
323323
There is also a Visual Studio build performed at each commit to the
324324
SEACAS git repository. See the file `.appveyor.yml` for more details.
325325

326+
### Windows Powershell
327+
A script provided by a user shows how they build on Windows using Powershell. See [WIKI: Windows Powershell Script](https://github.com/sandialabs/seacas/wiki/Windows-Powershell-Script).
328+
326329
## License
327330

328331
SEACAS is licensed under the Modified BSD License. See the [LICENSE](LICENSE) file for details.

TPL/catch2/runcmake.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ rm -f CMakeCache.txt
1919

2020
cmake \
2121
${RPATH} \
22+
-D CMAKE_CXX_COMPILER=${CXX} \
23+
-D CMAKE_CXX_STANDARD=17 \
2224
-D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
2325
-D CMAKE_PREFIX_PATH:PATH=${INSTALL_PATH}/lib \
2426
-D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} \
@@ -27,7 +29,7 @@ $EXTRA_ARGS \
2729
..
2830

2931
echo ""
30-
echo " COMPILER: ${CC}"
32+
echo " COMPILER: ${CXX}"
3133
echo " ACCESS: ${ACCESS}"
3234
echo "INSTALL_PATH: ${INSTALL_PATH}"
3335
echo ""

TPL/hdf5/runcmake.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \
6363
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
6464
-DDEFAULT_API_VERSION=V18 \
6565
-DH5_DEFAULT_PLUGINDIR:PATH=${INSTALL_PATH}/lib/hdf5/lib/plugin \
66+
-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF \
6667
-DHDF5_ENABLE_PARALLEL:BOOL=${MPI} \
6768
-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON \
6869
-DHDF5_BUILD_CPP_LIB:BOOL=${H5CPP} \

cmake-config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ ${ADIOS2_SYMBOLS} \
555555
-D Metis_ROOT:PATH=${METIS_PATH} \
556556
-D ParMETIS_ROOT:PATH=${PARMETIS_PATH} \
557557
-D PNetCDF_ROOT:PATH=${PNETCDF_PATH} \
558+
-D Catch2_ROOT:PATH=${CATCH2_PATH} \
558559
-D fmt_ROOT:PATH=${FMT_PATH} \
559560
$EXTRA_ARGS \
560561
${ACCESS}

docker/exodus/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02
1+
FROM ubuntu:24.04@sha256:b59d21599a2b151e23eea5f6602f4af4d7d31c4e236d22bf0b62b86d2e386b8f
22
ARG DEBIAN_FRONTEND=noninteractive
33
RUN apt-get update && \
44
apt-get install --no-install-recommends -y \

0 commit comments

Comments
 (0)