Skip to content

Commit 6b08a9b

Browse files
author
Kenneth Griesser
committed
final merge with devel
2 parents b8f3aba + f1269c3 commit 6b08a9b

40 files changed

+1414
-358
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ WhitespaceSensitiveMacros:
326326
- SST_ELI_REGISTER_REALTIME_ACTION
327327
- SST_ELI_REGISTER_PORTMODULE
328328
- SST_ELI_REGISTER_INTERACTIVE_CONSOLE
329+
- SST_ELI_IS_CHECKPOINTABLE
329330
- STRINGIZE
330331
- PP_STRINGIZE
331332
- BOOST_PP_STRINGIZE

.github/workflows/PR_cmake-format_test.yml

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

.github/workflows/free-macos-14.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ jobs:
4545
echo "MAKEFLAGS=${MAKEFLAGS}" >> "${GITHUB_ENV}"
4646
echo "TERM=dumb" >> "${GITHUB_ENV}"
4747
48+
- name: Pin Python version
49+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
50+
with:
51+
python-version: '3.9'
52+
4853
- name: Compile core
4954
run: |
5055
# TODO the argument does nothing as long as Spack is unavailable

.github/workflows/free-macos-15.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ jobs:
4545
echo "MAKEFLAGS=${MAKEFLAGS}" >> "${GITHUB_ENV}"
4646
echo "TERM=dumb" >> "${GITHUB_ENV}"
4747
48+
- name: Pin Python version
49+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
50+
with:
51+
python-version: '3.13'
52+
4853
- name: Compile core
4954
run: |
5055
# TODO the argument does nothing as long as Spack is unavailable

scripts/cmake-format-test.sh

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

0 commit comments

Comments
 (0)