Merge Pull Request #13688 from trilinos/Trilinos/master_merge_2024122…

…0_175822 Automatically Merged using Trilinos Master Merge AutoTester PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20241220_175822 branch to master' PR Author: trilinos-autotester
trilinos · Dec 21, 2024 · c4e1b93 · c4e1b93
2 parents 7f913e3 + ece6cfc
commit c4e1b93
Show file tree

Hide file tree

Showing 71 changed files with 3,305 additions and 1,117 deletions.
diff --git a/.github/workflows/AT2.yml b/.github/workflows/AT2.yml
@@ -1,4 +1,4 @@
-name: AT2-EXPERIMENTAL
+name: AT2
 
 on:
   pull_request:
@@ -74,7 +74,7 @@ jobs:
       - name: get dependencies
         working-directory: ./packages/framework
         run: |
-          bash -l -c "./get_dependencies.sh --container"
+          bash -l -c "./get_dependencies.sh"
       - name: PullRequestLinuxDriverTest.py
         shell: bash -l {0}
         working-directory: /home/Trilinos/build
@@ -128,7 +128,7 @@ jobs:
           echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
           echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
 
-  gcc830-serial-EXPERIMENTAL:
+  gcc830:
     needs: pre-checks
     runs-on: [self-hosted, gcc-8.3.0_serial]
     if: ${{ needs.pre-checks.outputs.should_skip != 'true' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED') }}
@@ -167,7 +167,7 @@ jobs:
       - name: get dependencies
         working-directory: ./packages/framework
         run: |
-          bash -l -c "./get_dependencies.sh --container"
+          bash -l -c "./get_dependencies.sh"
       - name: PullRequestLinuxDriverTest.py
         shell: bash -l {0}
         working-directory: /home/Trilinos/build
@@ -260,7 +260,7 @@ jobs:
       - name: get dependencies
         working-directory: ./packages/framework
         run: |
-          bash -l -c "./get_dependencies.sh --container"
+          bash -l -c "./get_dependencies.sh"
       - name: PullRequestLinuxDriverTest.py
         shell: bash -l {0}
         working-directory: /home/Trilinos/build
@@ -314,7 +314,7 @@ jobs:
           echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
           echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
 
-  framework-tests-EXPERIMENTAL:
+  framework-tests:
     needs: pre-checks
     runs-on: [self-hosted, python-3.9]
     if: ${{ needs.pre-checks.outputs.should_skip != 'true' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED') }}
@@ -353,7 +353,7 @@ jobs:
       - name: get dependencies
         working-directory: ./packages/framework
         run: |
-          bash -l -c "./get_dependencies.sh --container"
+          bash -l -c "./get_dependencies.sh"
       - name: PullRequestLinuxDriverTest.py
         shell: bash -l {0}
         working-directory: /home/Trilinos/build

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -45,7 +45,7 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+      uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -108,6 +108,6 @@ jobs:
           ninja -j 16
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+      uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           sarif_file: results.sarif
diff --git a/packages/framework/get_dependencies.sh b/packages/framework/get_dependencies.sh
@@ -3,7 +3,8 @@ ini_file_option=$1
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
 
 # Data that needs to be updated when GenConfig changes!
-genconfig_sha1=924a08af66f0a0573b5dd1128179731489339aec
+genconfig_sha1=88c44e347c0377a170ec9ca45a47732a9630b4ec
+
 
 # The following code contains no changing data
 
@@ -70,15 +71,10 @@ function tril_genconfig_clone_or_update_repo() {
   popd &> /dev/null
 }
 
-# Clone or update the repos
-if [[ "$ini_file_option" == "--container" ]] ; then
-  echo "In a container it is assumed that GenConfig is already in the container at /GenConfig"
-else
-  #Clone GenConfig from gitlab-ex
-  tril_genconfig_clone_or_update_repo \
-    [email protected]:trilinos-devops-consolidation/code/GenConfig.git \
-    GenConfig  has-submodules ${genconfig_sha1}
-fi
+# Clone GenConfig from GitHub
+tril_genconfig_clone_or_update_repo \
+  https://github.com/sandialabs/GenConfig.git \
+  GenConfig  has-submodules ${genconfig_sha1}
 
 if [[ "$ini_file_option" == "--srn" ]] ; then
   #Clone srn-ini-files from cee-gitlab
@@ -92,10 +88,6 @@ elif [[ "$ini_file_option" == "--son" ]] ; then
     [email protected]:trilinos-project/son-ini-files.git \
     son-ini-files
 
-elif [[ "$ini_file_option" == "--container" ]] ; then
-  #Copy Genconfig into place from /GenConfig
-  cp -R /GenConfig ${script_dir}
-
 elif [[ "$ini_file_option" != "" ]] ; then
   echo "ERROR: Option '${ini_file_option}' not allowed! Must select '--son', '--srn' or ''."
   exit 1