GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 01:14:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not fail if brew has an updated version of a package we already cached

Browse Source
This commit is contained in:
Alessandro Ranellucci 2018-11-09 10:10:15 +01:00
parent 7739cae3f3
commit 3f155825e1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/osx/travis-build-cpp.sh
View File

@ -8,7 +8,7 @@ mkdir -p $CACHE
( sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )& ( sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )&
brew update -v brew update -v
brew install ccache brew upgrade ccache || brew install ccache
if [[ "$WXVERSION" != "pkg" ]]; then if [[ "$WXVERSION" != "pkg" ]]; then
WXVER_EXPANDED=${WXVERSION:0:1}.${WXVERSION:1:1}.${WXVERSION:2:1} WXVER_EXPANDED=${WXVERSION:0:1}.${WXVERSION:1:1}.${WXVERSION:2:1}
@ -26,7 +26,7 @@ if [[ "$WXVERSION" != "pkg" ]]; then
export PATH=${PATH}:${WXDIR} export PATH=${PATH}:${WXDIR}
cd $TRAVIS_BUILD_DIR # go back to the build dir cd $TRAVIS_BUILD_DIR # go back to the build dir
else else
brew install wxmac # install via homebrew brew upgrade wxmac || brew install wxmac # install via homebrew
fi fi
mkdir build && cd build mkdir build && cd build

5
package/osx/travis-build-main.sh
View File

@ -2,7 +2,10 @@
set -euo pipefail set -euo pipefail
brew update -v brew update -v
brew install boost perl cpanminus wxwidgets brew upgrade boost || brew install boost
brew upgrade perl || brew install perl
brew upgrade cpanminus || brew install cpanminus
brew upgrade wxwidgets || brew install wxwidgets
brew link --overwrite perl cpanminus brew link --overwrite perl cpanminus
export SLIC3R_STATIC=1 export SLIC3R_STATIC=1