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

Try to compile on OSX 10.12 and fix Mac deployment

Browse Source
This commit is contained in:
Alessandro Ranellucci 2018-11-09 16:53:40 +01:00
parent dd4dfab255
commit 28592cf160
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -20,7 +20,7 @@ before_install:
script: script:
- if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "main" ]]; then ./package/linux/travis-build-main.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "main" ]]; then ./package/linux/travis-build-main.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "cpp" ]]; then ./package/linux/travis-build-cpp.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "cpp" ]]; then ./package/linux/travis-build-cpp.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "main" ]]; then travis_wait 60 ./package/osx/travis-build-main.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "main" ]]; then ./package/osx/travis-build-main.sh; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "cpp" ]]; then ./package/osx/travis-build-cpp.sh; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" && "$TARGET" == "cpp" ]]; then ./package/osx/travis-build-cpp.sh; fi
branches: branches:
@ -72,7 +72,8 @@ matrix:
- package/linux/travis-deploy-cpp.sh - package/linux/travis-deploy-cpp.sh
- os: osx - os: osx
osx_image: xcode8 # OS X 10.11 #osx_image: xcode8 # OS X 10.11
osx_image: xcode9.2 # OS X 10.12
env: env:
- TARGET=main - TARGET=main
cache: cache:

2
package/deploy/sftp.sh
View File

@ -18,7 +18,7 @@ fi
if [ -s $KEY ]; then if [ -s $KEY ]; then
for i in $FILES; do for i in $FILES; do
filepath=$(readlink -f "$i") filepath=$i # this is expected to be an absolute path
tmpfile=$(mktemp) tmpfile=$(mktemp)
echo put $filepath > $tmpfile echo put $filepath > $tmpfile
sftp -b $tmpfile -i$KEY "${UPLOAD_USER}@dl.slic3r.org:$DIR/" sftp -b $tmpfile -i$KEY "${UPLOAD_USER}@dl.slic3r.org:$DIR/"

2
package/linux/travis-deploy-main.sh
View File

@ -8,6 +8,6 @@ LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64
package/linux/appimage.sh x86_64 package/linux/appimage.sh x86_64
package/deploy/sftp.sh linux ~/slic3r-upload.rsa *.bz2 Slic3r*.AppImage package/deploy/sftp.sh linux ~/slic3r-upload.rsa `pwd`/*.bz2 `pwd`/Slic3r*.AppImage
package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa AppImage Slic3r*.AppImage package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa AppImage Slic3r*.AppImage
package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa tar.bz2 *.bz2 package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa tar.bz2 *.bz2

2
package/osx/travis-deploy-main.sh
View File

@ -2,4 +2,4 @@
set -euo pipefail set -euo pipefail
package/osx/make_dmg.sh package/osx/make_dmg.sh
package/deploy/sftp.sh mac ~/slic3r-upload.rsa *.bz2 slic3r*.dmg package/deploy/sftp.sh mac ~/slic3r-upload.rsa `pwd`/slic3r*.dmg