Skip to content

Commit da3375f

Browse files
cgcgcgcgcgcg
authored
Merge pull request #15149 from trilinos/master_merge_20260418_0435
Master Merge: Automatic PR from develop to master
2 parents 96a857e + 5fc71a3 commit da3375f

150 files changed

Lines changed: 1711 additions & 328 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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
cp ./genconfig_build_name.txt /home/runner/artifacts/
136136
- name: Upload artifacts
137137
if: success() || failure()
138-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
138+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
139139
env:
140140
NODE_TLS_REJECT_UNAUTHORIZED: 0
141141
with:
@@ -249,7 +249,7 @@ jobs:
249249
cp ./genconfig_build_name.txt /home/runner/artifacts/
250250
- name: Upload artifacts
251251
if: success() || failure()
252-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
252+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
253253
env:
254254
NODE_TLS_REJECT_UNAUTHORIZED: 0
255255
with:
@@ -364,7 +364,7 @@ jobs:
364364
cp ./genconfig_build_name.txt /home/runner/artifacts/
365365
- name: Upload artifacts
366366
if: success() || failure()
367-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
367+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
368368
env:
369369
NODE_TLS_REJECT_UNAUTHORIZED: 0
370370
with:
@@ -479,7 +479,7 @@ jobs:
479479
cp ./genconfig_build_name.txt /home/runner/artifacts/
480480
- name: Upload artifacts
481481
if: success() || failure()
482-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
482+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
483483
env:
484484
NODE_TLS_REJECT_UNAUTHORIZED: 0
485485
with:
@@ -593,7 +593,7 @@ jobs:
593593
cp ./genconfig_build_name.txt /home/runner/artifacts/
594594
- name: Upload artifacts
595595
if: success() || failure()
596-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
596+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
597597
env:
598598
NODE_TLS_REJECT_UNAUTHORIZED: 0
599599
with:
@@ -704,7 +704,7 @@ jobs:
704704
cp ./genconfig_build_name.txt /home/runner/artifacts/
705705
- name: Upload artifacts
706706
if: success() || failure()
707-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
707+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
708708
env:
709709
NODE_TLS_REJECT_UNAUTHORIZED: 0
710710
with:
@@ -817,7 +817,7 @@ jobs:
817817
cp ./genconfig_build_name.txt /home/runner/artifacts/
818818
- name: Upload artifacts
819819
if: success() || failure()
820-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
820+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
821821
env:
822822
NODE_TLS_REJECT_UNAUTHORIZED: 0
823823
with:
@@ -920,7 +920,7 @@ jobs:
920920
cp ./genconfig_build_name.txt /home/runner/artifacts/
921921
- name: Upload artifacts
922922
if: success() || failure()
923-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
923+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
924924
env:
925925
NODE_TLS_REJECT_UNAUTHORIZED: 0
926926
with:

‎.github/workflows/cdash_urls.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,17 @@ jobs:
1919
message-id: cdash
2020
message: |
2121
[CDash for AT2 results](https://sems-cdash-son.sandia.gov/cdash/index.php?project=Trilinos&display=project&filtercount=2&showfilters=1&filtercombine=and&field1=buildname&compare1=65&value1=PR-${{ github.event.number }}&field2=buildstarttime&compare2=84&value2=now) [Currently only accessible from Sandia networks]
22+
23+
<details>
24+
25+
<summary>Reproducing CI builds locally</summary>
26+
27+
CI builds can be reproduced locally in a container.
28+
29+
Requirements: Python 3.9+, [Podman](https://podman.io/docs/installation), CMake
30+
31+
Steps:
32+
- Check out the branch of the PR locally.
33+
- Run `commonTools/pr_reproducer/reproducer.sh`.
34+
35+
</details>

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ on:
4646
required: false
4747
type: string
4848

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-
5449
jobs:
5550
build-test:
5651
runs-on: ${{ fromJson(inputs.target-runner-labels) }}
@@ -110,23 +105,23 @@ jobs:
110105
echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
111106
type python
112107
python3 ${TRILINOS_DIR}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
113-
--target-branch-name ${{ inputs.target-branch }} \
114108
--genconfig-build-name ${{ inputs.genconfig-string }} \
115-
--pullrequest-number ${{ github.event.pull_request.number }} \
109+
${{ inputs.target-branch && '--target-branch-name ' || '' }}${{ inputs.target-branch }} \
110+
${{ github.event.pull_request && '--pullrequest-number ' || '' }}${{ github.event.pull_request.number }} \
116111
--pullrequest-env-config-file ${TRILINOS_DIR}/packages/framework/pr_tools/trilinos_pr.ini \
117112
--pullrequest-gen-config-file ${TRILINOS_DIR}/packages/framework/GenConfig/src/gen-config.ini \
118113
--workspace-dir ${TRILINOS_DIR}/../ \
119114
--source-dir ${TRILINOS_DIR} \
120115
--build-dir ${BUILD_DIR} \
121-
--dashboard-build-name=${{ inputs.dashboard-build-name }} \
116+
${{ inputs.dashboard-build-name && '--dashboard-build-name ' || '' }}${{ inputs.dashboard-build-name }} \
122117
--ctest-driver ${TRILINOS_DIR}/cmake/SimpleTesting/cmake/ctest-driver.cmake \
123118
--ctest-drop-site ${{ inputs.ctest-drop-site }} \
124119
--pullrequest-cdash-track ${{ inputs.cdash-track }} \
125120
--filename-subprojects ./package_subproject_list.cmake \
126121
--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 }} \
122+
${{ inputs.max-cores-allowed && '--max-cores-allowed ' || '' }}${{ inputs.max-cores-allowed }} \
123+
${{ inputs.num-concurrent-tests && '--num-concurrent-tests ' || '' }}${{ inputs.num-concurrent-tests }} \
124+
${{ inputs.slots-per-gpu && '--slots-per-gpu ' || '' }}${{ inputs.slots-per-gpu }} \
130125
${{ inputs.extra-pr-driver-args }}
131126
- name: Filtered build error logs
132127
if: success() || failure()
@@ -148,7 +143,7 @@ jobs:
148143
cp ./genconfig_build_name.txt /home/runner/artifacts/
149144
- name: Upload artifacts
150145
if: success() || failure()
151-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
146+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
152147
env:
153148
NODE_USE_SYSTEM_CA: 1
154149
with:

‎.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@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
20+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
2121
with:
2222
egress-policy: audit
2323

‎.github/workflows/muelu_tutorial.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
2929
- name: Dispatch repository_dispatch event
3030
if: steps.changes.outputs.tutorial == 'true'
31-
uses: actions/github-script@v8
31+
uses: actions/github-script@v9.0.0
3232
with:
3333
github-token: ${{ secrets.MUELU_REPO_ACCESS_TOKEN }} # A PAT with 'repo' scope
3434
script: |

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ permissions:
1616
# TODO:
1717
# - Cancel any job runs with previous successful runs (working tree hash)
1818

19+
1920
jobs:
2021
cuda-kokkos-bounds-check:
2122
uses: ./.github/workflows/ci.yml

‎.github/workflows/pre_commit_comment.yml‎

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

1919
steps:
2020
- name: 'Download artifact'
21-
uses: actions/github-script@v8
21+
uses: actions/github-script@v9.0.0
2222
with:
2323
script: |
2424
let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({

‎.github/workflows/pre_commit_run.yml‎

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

2222
- run: if [ "$(cat format_patch.txt)" == "" ] ; then rm format_patch.txt ; else cat format_patch.txt; fi
2323

24-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
24+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
2525
id: upload-artf
2626
if: ${{ hashFiles('format_patch.txt') != '' }}
2727
with:
@@ -48,7 +48,7 @@ jobs:
4848
run: |
4949
echo $PR_NUMBER > pr_number
5050
51-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
51+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5252
id: upload-artf-msg
5353
if: ${{ hashFiles('format_patch_message.txt') != '' }}
5454
with:
@@ -57,7 +57,7 @@ jobs:
5757
format_patch_message.txt
5858
pr_number
5959
60-
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
60+
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
6161
if: ${{ hashFiles('format_patch.txt') != '' }}
6262
with:
6363
script: |

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5959
# format to the repository Actions tab.
6060
- name: "Upload artifact"
61-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
61+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6262
with:
6363
name: SARIF file
6464
path: results.sarif

‎.github/workflows/snapshot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
kokkos/scripts/snapshot.py --verbose kokkos-kernels Trilinos/packages/
5252
5353
- name: Create/update PR
54-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
54+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
5555
with:
5656
path: Trilinos
5757
token: ${{ steps.generate-token.outputs.token }}
@@ -110,7 +110,7 @@ jobs:
110110
kokkos/scripts/snapshot.py --verbose rol Trilinos/packages/
111111
112112
- name: Create/update PR
113-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
113+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
114114
with:
115115
path: Trilinos
116116
token: ${{ steps.generate-token.outputs.token }}

0 commit comments

Comments
 (0)