Skip to content

Commit 96a857e

Browse files
sebrownesebrowne
authored
Merge pull request #15122 from trilinos/master_merge_20260413_044332
Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20260413_044332 branch to master
2 parents 4e0ff70 + b409487 commit 96a857e

256 files changed

Lines changed: 10709 additions & 3740 deletions

File tree

Some content is hidden

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

‎.github/workflows/AT2.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ jobs:
115115
--filename-packageenables ./packageEnables.cmake \
116116
--max-cores-allowed=29 \
117117
--num-concurrent-tests=16
118+
- name: Build output logs
119+
if: success() || failure()
120+
shell: bash -l {0}
121+
run: |
122+
build_dir=/home/Trilinos/build
123+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
124+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
125+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
126+
--print-errors \
127+
--github-actions-mode
118128
- name: Copy artifacts
119129
if: success() || failure()
120130
shell: bash -l {0}
@@ -219,6 +229,16 @@ jobs:
219229
--filename-packageenables ./packageEnables.cmake \
220230
--max-cores-allowed=29 \
221231
--num-concurrent-tests=16
232+
- name: Build output logs
233+
if: success() || failure()
234+
shell: bash -l {0}
235+
run: |
236+
build_dir=/home/Trilinos/build
237+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
238+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
239+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
240+
--print-errors \
241+
--github-actions-mode
222242
- name: Copy artifacts
223243
if: success() || failure()
224244
shell: bash -l {0}
@@ -324,6 +344,16 @@ jobs:
324344
--max-cores-allowed=56 \
325345
--num-concurrent-tests=112 \
326346
--slots-per-gpu=8
347+
- name: Build output logs
348+
if: success() || failure()
349+
shell: bash -l {0}
350+
run: |
351+
build_dir=/home/Trilinos/build
352+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
353+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
354+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
355+
--print-errors \
356+
--github-actions-mode
327357
- name: Copy artifacts
328358
if: success() || failure()
329359
shell: bash -l {0}
@@ -429,6 +459,16 @@ jobs:
429459
--filename-packageenables ./packageEnables.cmake \
430460
--max-cores-allowed=29 \
431461
--num-concurrent-tests=16
462+
- name: Build output logs
463+
if: success() || failure()
464+
shell: bash -l {0}
465+
run: |
466+
build_dir=/home/Trilinos/build
467+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
468+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
469+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
470+
--print-errors \
471+
--github-actions-mode
432472
- name: Copy artifacts
433473
if: success() || failure()
434474
shell: bash -l {0}
@@ -533,6 +573,16 @@ jobs:
533573
--filename-packageenables ./packageEnables.cmake \
534574
--max-cores-allowed=56 \
535575
--skip-run-tests
576+
- name: Build output logs
577+
if: success() || failure()
578+
shell: bash -l {0}
579+
run: |
580+
build_dir=/home/Trilinos/build
581+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
582+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
583+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
584+
--print-errors \
585+
--github-actions-mode
536586
- name: Copy artifacts
537587
if: success() || failure()
538588
shell: bash -l {0}
@@ -634,6 +684,16 @@ jobs:
634684
--filename-packageenables ./packageEnables.cmake \
635685
--max-cores-allowed=29 \
636686
--num-concurrent-tests=16
687+
- name: Build output logs
688+
if: success() || failure()
689+
shell: bash -l {0}
690+
run: |
691+
build_dir=/home/Trilinos/build
692+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
693+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
694+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
695+
--print-errors \
696+
--github-actions-mode
637697
- name: Copy artifacts
638698
if: success() || failure()
639699
shell: bash -l {0}
@@ -738,6 +798,15 @@ jobs:
738798
--filename-packageenables ./packageEnables.cmake \
739799
--max-cores-allowed=29 \
740800
--num-concurrent-tests=16
801+
- name: Build output logs
802+
shell: bash -l {0}
803+
run: |
804+
build_dir=/home/Trilinos/build
805+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
806+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
807+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
808+
--print-errors \
809+
--github-actions-mode
741810
- name: Copy artifacts
742811
if: success() || failure()
743812
shell: bash -l {0}
@@ -831,6 +900,16 @@ jobs:
831900
--ctest-drop-site sems-cdash-son.sandia.gov/cdash \
832901
--filename-subprojects ./package_subproject_list.cmake \
833902
--skip-create-packageenables
903+
- name: Build output logs
904+
if: success() || failure()
905+
shell: bash -l {0}
906+
run: |
907+
build_dir=/home/Trilinos/build
908+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
909+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
910+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
911+
--print-errors \
912+
--github-actions-mode
834913
- name: Copy artifacts
835914
if: success() || failure()
836915
shell: bash -l {0}

‎.github/workflows/cdash_urls.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pull-requests: write
1313
steps:
1414
- name: Post CDash URLs
15-
uses: mshick/add-pr-comment@ffd016c7e151d97d69d21a843022fd4cd5b96fe5 # v3.9.0.8.3.9.0
15+
uses: mshick/add-pr-comment@64b8e914979889d746c99dea15a76e77ef64580a # v3.10.0.8.3.10.0
1616
env:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
with:

‎.github/workflows/ci.yml‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
name: Single build and test pipeline
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
target-runner-labels:
7+
required: true
8+
type: string
9+
genconfig-string:
10+
required: true
11+
type: string
12+
target-branch:
13+
required: false
14+
type: string
15+
default: "develop"
16+
max-cores-allowed:
17+
description: 'Max cores allowed that is detected on the system.'
18+
required: false
19+
type: number
20+
default: 12
21+
ctest-drop-site:
22+
required: false
23+
type: string
24+
default: "sems-cdash-son.sandia.gov/cdash"
25+
cdash-track:
26+
description: 'Pull Request, Nightly, or Experimental'
27+
required: false
28+
type: string
29+
default: "Pull Request"
30+
dashboard-build-name:
31+
required: false
32+
type: string
33+
default:
34+
num-concurrent-tests:
35+
description: 'Number of concurrent tests allowed in CTest.'
36+
required: false
37+
type: number
38+
default: -1
39+
slots-per-gpu:
40+
description: 'On a GPU machine, this is number of slots allowed per GPU. (e.g. 4 allows 4 MPI ranks per GPU)'
41+
required: false
42+
type: number
43+
default: 0
44+
extra-pr-driver-args:
45+
description: 'Extra arguments to be used when calling PullRequestLinuxDriverTest.py'
46+
required: false
47+
type: string
48+
49+
# Cancels any in progress 'workflows' associated with this workflow ref
50+
concurrency:
51+
group: ${{ github.workflow }}-${{ github.ref }}
52+
cancel-in-progress: true
53+
54+
jobs:
55+
build-test:
56+
runs-on: ${{ fromJson(inputs.target-runner-labels) }}
57+
steps:
58+
- name: Clone Trilinos
59+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
60+
with:
61+
fetch-depth: 1
62+
- name: Print debug outputs
63+
shell: bash -l {0}
64+
env:
65+
GITHUB_CONTEXT: ${{ toJson(github) }}
66+
run: |
67+
echo "::group::Loaded environment variables"
68+
env
69+
echo "::endgroup::"
70+
71+
echo "::group::Loaded modules"
72+
module list
73+
echo "::endgroup::"
74+
75+
echo "::group::Ccache stats"
76+
ccache --show-stats --verbose
77+
echo "::endgroup::"
78+
79+
echo "::group::Cloned repository status"
80+
pwd
81+
ls -lhat
82+
git status
83+
git branch -vv
84+
git branch -a
85+
echo "::endgroup::"
86+
- name: Get CI script dependencies
87+
working-directory: ./packages/framework
88+
run: |
89+
mkdir -p /home/Trilinos/build
90+
git fetch origin ${{ inputs.target-branch }}
91+
./get_dependencies.sh
92+
- name: Run build and test driver script
93+
shell: bash -l {0}
94+
working-directory: /home/Trilinos/build
95+
run: |
96+
# python is python3 hackery
97+
pwd
98+
mkdir bin
99+
pushd bin
100+
ln -s $(type -p python3) python
101+
export PATH=$(pwd):${PATH}
102+
popd
103+
104+
export TRILINOS_DIR=${GITHUB_WORKSPACE:?}
105+
export BUILD_DIR=/home/Trilinos/build
106+
export PYTHONPATH=${PYTHONPATH}:${TRILINOS_DIR}/packages/framework/GenConfig
107+
export PYTHONPATH=${PYTHONPATH}:${TRILINOS_DIR}/packages/framework/pr_tools
108+
printf "\n\n\n"
109+
110+
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
111+
type python
112+
python3 ${TRILINOS_DIR}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
113+
--target-branch-name ${{ inputs.target-branch }} \
114+
--genconfig-build-name ${{ inputs.genconfig-string }} \
115+
--pullrequest-number ${{ github.event.pull_request.number }} \
116+
--pullrequest-env-config-file ${TRILINOS_DIR}/packages/framework/pr_tools/trilinos_pr.ini \
117+
--pullrequest-gen-config-file ${TRILINOS_DIR}/packages/framework/GenConfig/src/gen-config.ini \
118+
--workspace-dir ${TRILINOS_DIR}/../ \
119+
--source-dir ${TRILINOS_DIR} \
120+
--build-dir ${BUILD_DIR} \
121+
--dashboard-build-name=${{ inputs.dashboard-build-name }} \
122+
--ctest-driver ${TRILINOS_DIR}/cmake/SimpleTesting/cmake/ctest-driver.cmake \
123+
--ctest-drop-site ${{ inputs.ctest-drop-site }} \
124+
--pullrequest-cdash-track ${{ inputs.cdash-track }} \
125+
--filename-subprojects ./package_subproject_list.cmake \
126+
--filename-packageenables ./packageEnables.cmake \
127+
--max-cores-allowed=${{ inputs.max-cores-allowed }} \
128+
--num-concurrent-tests=${{ inputs.num-concurrent-tests }} \
129+
--slots-per-gpu=${{ inputs.slots-per-gpu }} \
130+
${{ inputs.extra-pr-driver-args }}
131+
- name: Filtered build error logs
132+
if: success() || failure()
133+
shell: bash -l {0}
134+
run: |
135+
build_dir=/home/Trilinos/build
136+
build_tag=$(head -n 1 ${build_dir}/Testing/TAG)
137+
python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/ctest_xml_printer.py \
138+
--ctest-xml-dir /home/Trilinos/build/Testing/${build_tag}/Build \
139+
--print-errors \
140+
--github-actions-mode
141+
- name: Copy artifacts
142+
if: success() || failure()
143+
shell: bash -l {0}
144+
working-directory: /home/Trilinos/build
145+
run: |
146+
cp ./packageEnables.cmake /home/runner/artifacts/
147+
cp ./configure_command.txt /home/runner/artifacts/
148+
cp ./genconfig_build_name.txt /home/runner/artifacts/
149+
- name: Upload artifacts
150+
if: success() || failure()
151+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
152+
env:
153+
NODE_USE_SYSTEM_CA: 1
154+
with:
155+
name: ${{ github.job }}-artifacts
156+
path: /home/runner/artifacts/*
157+
retention-days: 90
158+
- name: Write Summary
159+
if: ${{ !cancelled() }}
160+
uses: ./.github/workflows/actions/summary

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444

4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc
46+
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13
4747
env:
4848
NODE_USE_SYSTEM_CA: 1
4949
with:
@@ -108,6 +108,6 @@ jobs:
108108
ninja -j 16
109109
110110
- name: Perform CodeQL Analysis
111-
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v3.29.5
111+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v3.29.5
112112
with:
113113
category: "/language:${{matrix.language}}"

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
20+
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
2121
with:
2222
egress-policy: audit
2323

‎.github/workflows/flag_prs_to_master.yml‎

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

2020
steps:
2121
- name: Add comment
22-
uses: mshick/add-pr-comment@ffd016c7e151d97d69d21a843022fd4cd5b96fe5 # v3.9.0.8.3.9.0
22+
uses: mshick/add-pr-comment@64b8e914979889d746c99dea15a76e77ef64580a # v3.10.0.8.3.10.0
2323
if: "!contains(github.event.sender.login,'snapshot-app[bot]')"
2424
with:
2525
message: |

‎.github/workflows/nightly.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Nightly
2+
run-name: Nightly Pipeline (#${{ github.run_number }})
3+
4+
on:
5+
schedule:
6+
- cron: '0 0 * * *'
7+
timezone: "America/Denver"
8+
branches:
9+
- develop
10+
workflow_dispatch:
11+
12+
permissions:
13+
contents: read
14+
15+
16+
# TODO:
17+
# - Cancel any job runs with previous successful runs (working tree hash)
18+
19+
jobs:
20+
cuda-kokkos-bounds-check:
21+
uses: ./.github/workflows/ci.yml
22+
with:
23+
target-runner-labels: "['self-hosted', 'cuda-12.4.1-gcc-12.3.0-openmpi-4.1.6', '20251204', 'gpu:A100']"
24+
genconfig-string: "rhel_cuda-12-gcc-openmpi_debug_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_all"
25+
cdash-track: "Nightly"
26+
dashboard-build-name: ${AT2_IMAGE}_release_static_bounds-check
27+
max-cores-allowed: 56
28+
num-concurrent-tests: 112
29+
slots-per-gpu: 8
30+
31+
address-sanitizer:
32+
uses: ./.github/workflows/ci.yml
33+
with:
34+
target-runner-labels: "['self-hosted', 'clang-19.1.6-openmpi-4.1.6', '20251204']"
35+
genconfig-string: "rhel_clang-openmpi_release-debug_shared_no-kokkos-arch_asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all"
36+
cdash-track: "Nightly"
37+
dashboard-build-name: ${AT2_IMAGE}_release-debug_shared_address-sanitizer
38+
max-cores-allowed: 29
39+
num-concurrent-tests: 16

‎.github/workflows/pre_commit_comment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
echo "PR_NUMBER=$MY_PR_NUMBER" >> $GITHUB_ENV
5151
5252
- name: Post artifact in issue comment
53-
uses: mshick/add-pr-comment@ffd016c7e151d97d69d21a843022fd4cd5b96fe5 # v3.9.0.8.3.9.0
53+
uses: mshick/add-pr-comment@64b8e914979889d746c99dea15a76e77ef64580a # v3.10.0.8.3.10.0
5454
with:
5555
message-id: format-patch
5656
issue: ${{ env.PR_NUMBER }}

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ jobs:
6666

6767
# Upload the results to GitHub's code scanning dashboard.
6868
- name: "Upload to code-scanning"
69-
uses: github/codeql-action/upload-sarif@38697555549f1db7851b81482ff19f1fa5c4fedc # v3.29.5
69+
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v3.29.5
7070
with:
7171
sarif_file: results.sarif

0 commit comments

Comments
 (0)