Skip to content

Commit

Permalink
Remove repo package check from update script
Browse files Browse the repository at this point in the history
  • Loading branch information
mellery451 authored and manojsdoshi committed May 22, 2019
1 parent c78404e commit 3a780f8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion Builds/containers/gitlab-ci/build_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if docker pull "${ARTIFACTORY_HUB}/${container_name}:${CI_COMMIT_SHA}"; then
exit 0
else
echo "no existing ${pkgtype} container for this branch - searching history."
for CID_PREV in $(git log --pretty=%H -n5) ; do
for CID_PREV in $(git log --pretty=%H -n30) ; do
if docker pull "${ARTIFACTORY_HUB}/${container_name}:${CID_PREV}"; then
echo "found container for previous commit ${CID_PREV}" \
"- using as cache."
Expand Down
2 changes: 0 additions & 2 deletions Builds/containers/shared/update-rippled.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ if [[ "$ID" == "ubuntu" || "$ID" == "debian" ]] ; then
}
elif [[ "$ID" == "fedora" || "$ID" == "centos" || "$ID" == "rhel" || "$ID" == "scientific" ]] ; then
RIPPLE_REPO=${RIPPLE_REPO-stable}
# Update ripple.repo file
rpm -Uvh --replacepkgs https://mirrors.ripple.com/ripple-repo-el7.rpm
yum --disablerepo=* --enablerepo=ripple-$RIPPLE_REPO clean expire-cache

yum check-update -q --enablerepo=ripple-$RIPPLE_REPO rippled || can_update=true
Expand Down

0 comments on commit 3a780f8

Please sign in to comment.