Fix OSX build

Removed Azure Pipelines from build scripts
This commit is contained in:
Paulchen Panther 2020-12-19 21:10:07 +01:00
parent c24b972325
commit 910368476a
2 changed files with 6 additions and 13 deletions

View File

@ -1,14 +1,8 @@
#!/bin/bash #!/bin/bash
# detect CI # detect CI
if [ "$SYSTEM_COLLECTIONID" != "" ]; then if [ "$HOME" != "" ]; then
# Azure Pipelines
echo "Azure detected"
CI_NAME="$(echo "$AGENT_OS" | tr '[:upper:]' '[:lower:]')"
CI_BUILD_DIR="$BUILD_SOURCESDIRECTORY"
elif [ "$HOME" != "" ]; then
# GitHub Actions # GitHub Actions
echo "Github Actions detected"
CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')" CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')"
CI_BUILD_DIR="$GITHUB_WORKSPACE" CI_BUILD_DIR="$GITHUB_WORKSPACE"
else else

View File

@ -1,11 +1,7 @@
#!/bin/bash #!/bin/bash
# detect CI # detect CI
if [ "$SYSTEM_COLLECTIONID" != "" ]; then if [ "$HOME" != "" ]; then
# Azure Pipelines
CI_NAME="$(echo "$AGENT_OS" | tr '[:upper:]' '[:lower:]')"
CI_BUILD_DIR="$BUILD_SOURCESDIRECTORY"
elif [ "$HOME" != "" ]; then
# GitHub Actions # GitHub Actions
CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')" CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')"
CI_BUILD_DIR="$GITHUB_WORKSPACE" CI_BUILD_DIR="$GITHUB_WORKSPACE"
@ -19,12 +15,15 @@ function installAndUpgrade()
arr=("$@") arr=("$@")
for i in "${arr[@]}"; for i in "${arr[@]}";
do do
list_output=`brew list | grep $i` list_output=`brew list --formula | grep $i`
outdated_output=`brew outdated | grep $i` outdated_output=`brew outdated | grep $i`
if [[ ! -z "$list_output" ]]; then if [[ ! -z "$list_output" ]]; then
if [[ ! -z "$outdated_output" ]]; then if [[ ! -z "$outdated_output" ]]; then
echo "Outdated package: ${outdated_output}"
brew unlink ${outdated_output}
brew upgrade $i brew upgrade $i
brew link --overwrite $i
fi fi
else else
brew install $i brew install $i