From a08918d63eecb6f27edfd207ffd12624d86abe2f Mon Sep 17 00:00:00 2001 From: Jingjun Zhao Date: Sat, 29 Jan 2022 01:58:58 -0500 Subject: [PATCH 1/6] Try calling brew install eosio twice --- .cicd/test-package.run.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.cicd/test-package.run.sh b/.cicd/test-package.run.sh index 748be92772a..e7e366c3a93 100755 --- a/.cicd/test-package.run.sh +++ b/.cicd/test-package.run.sh @@ -13,6 +13,7 @@ elif [[ $(yum --version 2>/dev/null) ]]; then # RHEL family packaging perform 'yum install -y /eos/*.rpm' elif [[ $(brew --version 2>/dev/null) ]]; then # homebrew packaging perform 'brew update' + perform 'brew --version' perform 'mkdir homebrew-eosio' perform 'git init homebrew-eosio' perform 'cp *.rb homebrew-eosio' @@ -22,6 +23,11 @@ elif [[ $(brew --version 2>/dev/null) ]]; then # homebrew packaging perform '{ python3 -m http.server 7800 & } && export HTTP_SERVER_PID=$!' perform 'sleep 20s' perform 'brew install eosio' + ret=$? + if [[ "$ret" -ne 0 ]]; then + echo "Try installing eosio again" + perform 'brew install eosio' + fi perform 'kill $HTTP_SERVER_PID' else echo 'ERROR: Package manager not detected!' From 6ad064aa0462b60bdd83a7585bcc5e1cf5e5ad8b Mon Sep 17 00:00:00 2001 From: Jingjun Zhao Date: Sat, 29 Jan 2022 09:16:03 -0500 Subject: [PATCH 2/6] Disable HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK --- .cicd/test-package.run.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.cicd/test-package.run.sh b/.cicd/test-package.run.sh index e7e366c3a93..fad5fe81c56 100755 --- a/.cicd/test-package.run.sh +++ b/.cicd/test-package.run.sh @@ -19,15 +19,11 @@ elif [[ $(brew --version 2>/dev/null) ]]; then # homebrew packaging perform 'cp *.rb homebrew-eosio' perform "sed -i.bk -e 's/url \".*\"/url \"http:\/\/127.0.0.1:7800\"/' homebrew-eosio/*.rb" perform "pushd homebrew-eosio && git add *.rb && git commit -m 'test it!' && popd" + perform 'export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=false' perform "brew tap eosio/eosio homebrew-eosio" perform '{ python3 -m http.server 7800 & } && export HTTP_SERVER_PID=$!' perform 'sleep 20s' perform 'brew install eosio' - ret=$? - if [[ "$ret" -ne 0 ]]; then - echo "Try installing eosio again" - perform 'brew install eosio' - fi perform 'kill $HTTP_SERVER_PID' else echo 'ERROR: Package manager not detected!' From cd78515eb6097af40af6886369cbdeab1a56d0cb Mon Sep 17 00:00:00 2001 From: Jingjun Zhao Date: Mon, 31 Jan 2022 15:51:43 -0500 Subject: [PATCH 3/6] Test if the links are rebuilt before eosio is installed --- .cicd/test-package.run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/test-package.run.sh b/.cicd/test-package.run.sh index fad5fe81c56..3b44a22058e 100755 --- a/.cicd/test-package.run.sh +++ b/.cicd/test-package.run.sh @@ -14,12 +14,12 @@ elif [[ $(yum --version 2>/dev/null) ]]; then # RHEL family packaging elif [[ $(brew --version 2>/dev/null) ]]; then # homebrew packaging perform 'brew update' perform 'brew --version' + perform 'brew list --formula | xargs -I % sh -c "brew unlink %; brew link %"' perform 'mkdir homebrew-eosio' perform 'git init homebrew-eosio' perform 'cp *.rb homebrew-eosio' perform "sed -i.bk -e 's/url \".*\"/url \"http:\/\/127.0.0.1:7800\"/' homebrew-eosio/*.rb" perform "pushd homebrew-eosio && git add *.rb && git commit -m 'test it!' && popd" - perform 'export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=false' perform "brew tap eosio/eosio homebrew-eosio" perform '{ python3 -m http.server 7800 & } && export HTTP_SERVER_PID=$!' perform 'sleep 20s' From a3ce7d5a8eda096b4d066e8b37411404363a2ade Mon Sep 17 00:00:00 2001 From: Jingjun Zhao Date: Mon, 31 Jan 2022 17:54:40 -0500 Subject: [PATCH 4/6] Revert "Test if the links are rebuilt before eosio is installed" This reverts commit cd78515eb6097af40af6886369cbdeab1a56d0cb. --- .cicd/test-package.run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/test-package.run.sh b/.cicd/test-package.run.sh index 3b44a22058e..fad5fe81c56 100755 --- a/.cicd/test-package.run.sh +++ b/.cicd/test-package.run.sh @@ -14,12 +14,12 @@ elif [[ $(yum --version 2>/dev/null) ]]; then # RHEL family packaging elif [[ $(brew --version 2>/dev/null) ]]; then # homebrew packaging perform 'brew update' perform 'brew --version' - perform 'brew list --formula | xargs -I % sh -c "brew unlink %; brew link %"' perform 'mkdir homebrew-eosio' perform 'git init homebrew-eosio' perform 'cp *.rb homebrew-eosio' perform "sed -i.bk -e 's/url \".*\"/url \"http:\/\/127.0.0.1:7800\"/' homebrew-eosio/*.rb" perform "pushd homebrew-eosio && git add *.rb && git commit -m 'test it!' && popd" + perform 'export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=false' perform "brew tap eosio/eosio homebrew-eosio" perform '{ python3 -m http.server 7800 & } && export HTTP_SERVER_PID=$!' perform 'sleep 20s' From bafd72d273587ffaa3d925ef28de338ee5f260c0 Mon Sep 17 00:00:00 2001 From: Jingjun Zhao Date: Mon, 7 Feb 2022 11:31:36 -0500 Subject: [PATCH 5/6] Add brew upgrade --- .cicd/test-package.run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/test-package.run.sh b/.cicd/test-package.run.sh index fad5fe81c56..8980618c4f9 100755 --- a/.cicd/test-package.run.sh +++ b/.cicd/test-package.run.sh @@ -13,13 +13,13 @@ elif [[ $(yum --version 2>/dev/null) ]]; then # RHEL family packaging perform 'yum install -y /eos/*.rpm' elif [[ $(brew --version 2>/dev/null) ]]; then # homebrew packaging perform 'brew update' + perform 'brew upgrade' perform 'brew --version' perform 'mkdir homebrew-eosio' perform 'git init homebrew-eosio' perform 'cp *.rb homebrew-eosio' perform "sed -i.bk -e 's/url \".*\"/url \"http:\/\/127.0.0.1:7800\"/' homebrew-eosio/*.rb" perform "pushd homebrew-eosio && git add *.rb && git commit -m 'test it!' && popd" - perform 'export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=false' perform "brew tap eosio/eosio homebrew-eosio" perform '{ python3 -m http.server 7800 & } && export HTTP_SERVER_PID=$!' perform 'sleep 20s' From cbb68d2c9c524fe83504d1c46fc4ade4abfe6d5c Mon Sep 17 00:00:00 2001 From: Jingjun Zhao Date: Mon, 7 Feb 2022 12:52:50 -0500 Subject: [PATCH 6/6] Add brew doctor --- .cicd/test-package.run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.cicd/test-package.run.sh b/.cicd/test-package.run.sh index 8980618c4f9..18d078e3ed1 100755 --- a/.cicd/test-package.run.sh +++ b/.cicd/test-package.run.sh @@ -12,6 +12,7 @@ elif [[ $(yum --version 2>/dev/null) ]]; then # RHEL family packaging perform 'yum check-update || :' perform 'yum install -y /eos/*.rpm' elif [[ $(brew --version 2>/dev/null) ]]; then # homebrew packaging + perform 'brew doctor' perform 'brew update' perform 'brew upgrade' perform 'brew --version'