From 22ff93fa8bcc7f7920de799b0ef3b23fc5fdee56 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Thu, 11 Feb 2021 10:13:49 -0500 Subject: [PATCH] Fix postgres init issue. Unblocks MacOS base image rebuilds. --- .cicd/platforms/pinned/macos-10.14-pinned.sh | 5 +++-- .cicd/platforms/pinned/macos-10.15-pinned.sh | 1 + .cicd/platforms/unpinned/macos-10.14-unpinned.sh | 5 +++-- .cicd/platforms/unpinned/macos-10.15-unpinned.sh | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cicd/platforms/pinned/macos-10.14-pinned.sh b/.cicd/platforms/pinned/macos-10.14-pinned.sh index 9c43914010b..3e6cbbf05a2 100755 --- a/.cicd/platforms/pinned/macos-10.14-pinned.sh +++ b/.cicd/platforms/pinned/macos-10.14-pinned.sh @@ -26,5 +26,6 @@ cd .. sudo rm -rf boost_1_72_0.tar.bz2 boost_1_72_0 # install nvm for ship_test cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium -# initialize postgres configuration files -initdb --locale=C -E UTF-8 /usr/local/var/postgres \ No newline at end of file +# initialize postgres configuration files +sudo rm -rf /usr/local/var/postgres +initdb --locale=C -E UTF-8 /usr/local/var/postgres diff --git a/.cicd/platforms/pinned/macos-10.15-pinned.sh b/.cicd/platforms/pinned/macos-10.15-pinned.sh index 480814ec785..6ca8c28050a 100755 --- a/.cicd/platforms/pinned/macos-10.15-pinned.sh +++ b/.cicd/platforms/pinned/macos-10.15-pinned.sh @@ -26,4 +26,5 @@ sudo rm -rf boost_1_72_0.tar.bz2 boost_1_72_0 # install nvm for ship_test cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium # initialize postgres configuration files +sudo rm -rf /usr/local/var/postgres initdb --locale=C -E UTF-8 /usr/local/var/postgres diff --git a/.cicd/platforms/unpinned/macos-10.14-unpinned.sh b/.cicd/platforms/unpinned/macos-10.14-unpinned.sh index b60b9699bb7..170724c3651 100755 --- a/.cicd/platforms/unpinned/macos-10.14-unpinned.sh +++ b/.cicd/platforms/unpinned/macos-10.14-unpinned.sh @@ -5,5 +5,6 @@ brew update brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl@1.1 jq boost libpq libpqxx postgres || : # install nvm for ship_test cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium -# initialize postgres configuration files -initdb --locale=C -E UTF-8 /usr/local/var/postgres \ No newline at end of file +# initialize postgres configuration files +sudo rm -rf /usr/local/var/postgres +initdb --locale=C -E UTF-8 /usr/local/var/postgres diff --git a/.cicd/platforms/unpinned/macos-10.15-unpinned.sh b/.cicd/platforms/unpinned/macos-10.15-unpinned.sh index dd32263dc00..b1b79078349 100755 --- a/.cicd/platforms/unpinned/macos-10.15-unpinned.sh +++ b/.cicd/platforms/unpinned/macos-10.15-unpinned.sh @@ -7,4 +7,5 @@ brew install git cmake python libtool libusb graphviz automake wget gmp pkgconfi # install nvm for ship_test cd ~ && brew install nvm && mkdir -p ~/.nvm && echo "export NVM_DIR=$HOME/.nvm" >> ~/.bash_profile && echo 'source $(brew --prefix nvm)/nvm.sh' >> ~/.bash_profile && cat ~/.bash_profile && source ~/.bash_profile && echo $NVM_DIR && nvm install --lts=dubnium # initialize postgres configuration files -initdb --locale=C -E UTF-8 /usr/local/var/postgres \ No newline at end of file +sudo rm -rf /usr/local/var/postgres +initdb --locale=C -E UTF-8 /usr/local/var/postgres