Skip to content

Commit

Permalink
Merge Pull Request #13655 from achauphan/Trilinos/update-get-deps
Browse files Browse the repository at this point in the history
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
trilinos-autotester authored Dec 18, 2024
2 parents f5960cc + 782c2d2 commit 8788c5b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/AT2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 6 additions & 14 deletions packages/framework/get_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 8788c5b

Please sign in to comment.