Merge 645dc18 into b1a5500

slic3r · Jul 25, 2021 · c6ea9ef · c6ea9ef
2 parents b1a5500 + 645dc18
commit c6ea9ef
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 47 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,8 +33,8 @@ addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
-    - sourceline: 'deb http://download.opensuse.org/repositories/science:/dlr/xUbuntu_14.04/ /'
-      key_url: 'https://download.opensuse.org/repositories/science:dlr/xUbuntu_14.04/Release.key'
+    #- sourceline: 'deb http://download.opensuse.org/repositories/science:/dlr/xUbuntu_14.04/ /'
+    #  key_url: 'https://download.opensuse.org/repositories/science:dlr/xUbuntu_14.04/Release.key'
     packages:
     - g++-7
     - gcc-7
@@ -47,6 +47,10 @@ addons:
     - wx3.0-headers
     - libwxgtk3.0-dev
     - wx-common
+    - libboost-all-dev
+    - libboost-thread-dev
+    - libboost-system-dev
+    - libboost-filesystem-dev
   ssh_known_hosts: dl.slic3r.org
 
 matrix:
@@ -74,44 +78,29 @@ matrix:
           after_success:
             - package/linux/travis-deploy-cpp.sh
 
-        # While this works, it does not appear to be needed as the 10.13 builds
-        # work on 10.12 as well.
-        # - os: osx
-        #   # osx_image: xcode8 # OS X 10.11
-        #   osx_image: xcode9.2 # OS X 10.12
-        #   env:
-        #     - TARGET=main
-        #   cache:
-        #     directories:
-        #       - /usr/local/Homebrew
-        #       - $HOME/Library/Caches/Homebrew
-        #       - local-lib
-
-              # OSX errors out consistently for Perl now too. Back to jenkins.
-              #        - os: osx
-              #          osx_image: xcode9.4 # OS X 10.13
-              #          env:
-              #            - TARGET=main
-              #          cache:
-              #            directories:
-              #              - /usr/local/Homebrew
-              #              - $HOME/Library/Caches/Homebrew
-              #              - local-lib
-              #          after_success:
-              #            - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/osx/travis-deploy-main.sh || travis_terminate 1; fi
+        - os: osx
+          osx_image: xcode11.5 # OS X 10.15.4
+          env:
+            - TARGET=main
+          cache:
+            directories:
+              - /usr/local/Homebrew
+              - $HOME/Library/Caches/Homebrew
+              - local-lib
+          after_success:
+            - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/osx/travis-deploy-main.sh || travis_terminate 1; fi
 
-        # OSX is erroring out consistently for C++, remove and debug
-              #        - os: osx
-              #          osx_image: xcode9.4
-              #          env:
-              #            - TARGET=cpp
-              #            - CACHE=$HOME/cache
-              #          cache:
-              #            ccache: true
-              #            directories:
-              #              - /usr/local/Homebrew
-              #              - $HOME/cache
-              #              - $HOME/Library/Caches/Homebrew
+        - os: osx
+          osx_image: xcode11.5 # OS X 10.15.4
+          env:
+            - TARGET=cpp
+            - CACHE=$HOME/cache
+          cache:
+            ccache: true
+            directories:
+              - /usr/local/Homebrew
+              - $HOME/cache
+              - $HOME/Library/Caches/Homebrew
 
 env:
   global:

diff --git a/package/linux/travis-build-cpp.sh b/package/linux/travis-build-cpp.sh
@@ -23,13 +23,6 @@ if [[ "$WXVERSION"  != "pkg" ]]; then
     tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
 fi
 
-if [ ! -e $CACHE/boost-compiled.tar.bz2 ]; then
-    echo "Downloading http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2 => $CACHE/boost-compiled.tar.bz2"
-    curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o $CACHE/boost-compiled.tar.bz2
-fi
-
-tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
-
 mkdir build && cd build
 ${CMAKE} -DBOOST_ROOT=$HOME/boost_1_63_0 -DSLIC3R_STATIC=ON -DCMAKE_BUILD_TYPE=Release ../src
 ${CMAKE} --build .

diff --git a/package/osx/travis-build-main.sh b/package/osx/travis-build-main.sh
@@ -10,7 +10,7 @@ brew update -v
 brew install boost     || brew upgrade boost
 brew install perl      || brew upgrade perl
 brew install cpanminus || brew upgrade cpanminus
-brew install wxwidgets || brew upgrade wxwidgets
+brew install wxmac@3.0 || brew upgrade wxmac@3.0
 brew install coreutils || brew upgrade coreutils
 brew link --overwrite perl cpanminus