From 910368476a8c584f89b0a100e21d2a70ef7774ca Mon Sep 17 00:00:00 2001 From: Paulchen Panther Date: Sat, 19 Dec 2020 21:10:07 +0100 Subject: [PATCH] Fix OSX build Removed Azure Pipelines from build scripts --- .ci/ci_build.sh | 8 +------- .ci/ci_install.sh | 11 +++++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.ci/ci_build.sh b/.ci/ci_build.sh index 00538255..d74d4144 100755 --- a/.ci/ci_build.sh +++ b/.ci/ci_build.sh @@ -1,14 +1,8 @@ #!/bin/bash # detect CI -if [ "$SYSTEM_COLLECTIONID" != "" ]; then - # Azure Pipelines - echo "Azure detected" - CI_NAME="$(echo "$AGENT_OS" | tr '[:upper:]' '[:lower:]')" - CI_BUILD_DIR="$BUILD_SOURCESDIRECTORY" -elif [ "$HOME" != "" ]; then +if [ "$HOME" != "" ]; then # GitHub Actions - echo "Github Actions detected" CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')" CI_BUILD_DIR="$GITHUB_WORKSPACE" else diff --git a/.ci/ci_install.sh b/.ci/ci_install.sh index 1b262034..86c6ffd4 100755 --- a/.ci/ci_install.sh +++ b/.ci/ci_install.sh @@ -1,11 +1,7 @@ #!/bin/bash # detect CI -if [ "$SYSTEM_COLLECTIONID" != "" ]; then - # Azure Pipelines - CI_NAME="$(echo "$AGENT_OS" | tr '[:upper:]' '[:lower:]')" - CI_BUILD_DIR="$BUILD_SOURCESDIRECTORY" -elif [ "$HOME" != "" ]; then +if [ "$HOME" != "" ]; then # GitHub Actions CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')" CI_BUILD_DIR="$GITHUB_WORKSPACE" @@ -19,12 +15,15 @@ function installAndUpgrade() arr=("$@") for i in "${arr[@]}"; do - list_output=`brew list | grep $i` + list_output=`brew list --formula | grep $i` outdated_output=`brew outdated | grep $i` if [[ ! -z "$list_output" ]]; then if [[ ! -z "$outdated_output" ]]; then + echo "Outdated package: ${outdated_output}" + brew unlink ${outdated_output} brew upgrade $i + brew link --overwrite $i fi else brew install $i