-
Notifications
You must be signed in to change notification settings - Fork 572
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge Pull Request #13655 from achauphan/Trilinos/update-get-deps
Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Framework: Update get_dependencies.sh script to use open-sourced repo' PR Author: achauphan
- Loading branch information
Showing
2 changed files
with
10 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|