ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
DRC
2019-05-09 19:13:39 -05:00
parent f36d531553 c8e52741fd
commit 85d96d4478
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -14,7 +14,7 @@ matrix:
- docker - docker
- os: osx - os: osx
env: BUILD_OFFICIAL=1 env: BUILD_OFFICIAL=1
osx_image: xcode7.3 osx_image: xcode8.3
- os: linux - os: linux
dist: trusty dist: trusty
compiler: clang compiler: clang
@@ -55,11 +55,9 @@ matrix:
addons: addons:
homebrew: homebrew:
brewfile: true brewfile: true
update: true
before_install: before_install:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
ln -fs /usr/local/bin/gpg1 /usr/local/bin/gpg &&
git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor && git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
ln -fs /Applications/Xcode.app /Applications/Xcode72.app; ln -fs /Applications/Xcode.app /Applications/Xcode72.app;
fi fi
@@ -73,7 +71,7 @@ before_install:
tar xf ci/keys && tar xf ci/keys &&
rm ci/keys && rm ci/keys &&
mv ci/gpgsign ~/src/buildscripts && mv ci/gpgsign ~/src/buildscripts &&
gpg --import ci/sign_ljt && gpg --batch --import ci/sign_ljt &&
rm ci/sign_ljt; rm ci/sign_ljt;
fi fi
fi fi