From 5e854742c6f6e9a8484e61fe4513181dfffb2907 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Tue, 27 Nov 2018 22:25:56 -0600 Subject: [PATCH 1/3] Make travis count builds as failed when if statements are used. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e1bd007e..79f2d8882 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ matrix: - $HOME/wx302 - local-lib after_success: - - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/linux/travis-deploy-main.sh; fi + - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/linux/travis-deploy-main.sh || travis_terminate 1; fi - os: linux env: @@ -95,7 +95,7 @@ matrix: - $HOME/Library/Caches/Homebrew - local-lib after_success: - - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/osx/travis-deploy-main.sh; fi + - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/osx/travis-deploy-main.sh || travis_terminate 1; fi - os: osx osx_image: xcode9.4 From 76d3813cdbb4ed423bfed9a9e9dce4e1113f5ee5 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Tue, 27 Nov 2018 22:27:21 -0600 Subject: [PATCH 2/3] ensure perlbrew perl is used for travis deploy (no idea why it isn't). --- package/linux/travis-deploy-main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/linux/travis-deploy-main.sh b/package/linux/travis-deploy-main.sh index a57ec6010..333813f47 100755 --- a/package/linux/travis-deploy-main.sh +++ b/package/linux/travis-deploy-main.sh @@ -1,6 +1,8 @@ #!/bin/bash set -euo pipefail +source $HOME/perl5/perlbrew/etc/bashrc +perlbrew switch slic3r-perl eval $(perl -Mlocal::lib=$TRAVIS_BUILD_DIR/local-lib) cd package/linux && make -f build_shell.mk && mv Slic3r* $TRAVIS_BUILD_DIR && cd $TRAVIS_BUILD_DIR From 9b6bd5dd364cc40fcda7f5bbce7c25156d278b2f Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Thu, 29 Nov 2018 00:35:24 +0100 Subject: [PATCH 3/3] Fix compilation on older gcc --- xs/src/libslic3r/Print.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp index 487a5b418..27e500576 100644 --- a/xs/src/libslic3r/Print.cpp +++ b/xs/src/libslic3r/Print.cpp @@ -230,7 +230,7 @@ Print::make_skirt() skirts = 1; const std::set extruders{ this->extruders() }; - auto extruder_it { extruders.begin() }; + auto extruder_it = extruders.begin(); std::vector e_per_mm{0}, extruded_length{0}; if (this->config.min_skirt_length() > 0) for (auto i : extruders)