From e01058370cb006fb619420164f0b3575b8b28c3e Mon Sep 17 00:00:00 2001 From: Anderson Chauphan Date: Tue, 3 Dec 2024 16:03:13 -0600 Subject: [PATCH 1/3] Update default get_dependencies case GenConfig is open-sourced now, point default get_dependencies to the GitHub repository and remove the container specific cases. Signed-off-by: Anderson Chauphan --- packages/framework/get_dependencies.sh | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/framework/get_dependencies.sh b/packages/framework/get_dependencies.sh index 74c26e4eb601..d07bec01f206 100755 --- 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=HEAD + # The following code contains no changing data @@ -59,7 +60,7 @@ function tril_genconfig_clone_or_update_repo() { if [[ "${has_submodules}" == "has-submodules" ]] ; then echo echo "STATUS: ${sub_dir}: Update submodules" - cmd="git submodule update --force --init --recursive" + cmd="git submodule update --force --init" retry_command "${cmd}" cd - > /dev/null elif [[ "${has_submodules}" != "" ]] ; then @@ -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 \ - git@gitlab-ex.sandia.gov: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 git@gitlab-ex.sandia.gov: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 From 284ac7245c11107e7ce4ff6efb73c919eb0eb52b Mon Sep 17 00:00:00 2001 From: Anderson Chauphan Date: Mon, 16 Dec 2024 21:36:41 -0600 Subject: [PATCH 2/3] Update GenConfig SHA1 and recursive submodule Signed-off-by: Anderson Chauphan --- packages/framework/get_dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/framework/get_dependencies.sh b/packages/framework/get_dependencies.sh index d07bec01f206..956857ecaf50 100755 --- a/packages/framework/get_dependencies.sh +++ b/packages/framework/get_dependencies.sh @@ -3,7 +3,7 @@ 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=HEAD +genconfig_sha1=88c44e347c0377a170ec9ca45a47732a9630b4ec # The following code contains no changing data @@ -60,7 +60,7 @@ function tril_genconfig_clone_or_update_repo() { if [[ "${has_submodules}" == "has-submodules" ]] ; then echo echo "STATUS: ${sub_dir}: Update submodules" - cmd="git submodule update --force --init" + cmd="git submodule update --force --init --recursive" retry_command "${cmd}" cd - > /dev/null elif [[ "${has_submodules}" != "" ]] ; then From 782c2d28e03b32b1f4a353ca0cb4fe657df22165 Mon Sep 17 00:00:00 2001 From: Anderson Chauphan Date: Tue, 17 Dec 2024 10:29:58 -0600 Subject: [PATCH 3/3] Remove --container from AT2 get_dependencies.sh calls Signed-off-by: Anderson Chauphan --- .github/workflows/AT2.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/AT2.yml b/.github/workflows/AT2.yml index c72e311ad456..53e68eca9564 100644 --- a/.github/workflows/AT2.yml +++ b/.github/workflows/AT2.yml @@ -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 @@ -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 @@ -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