mirror of
https://github.com/aphrody-labs/PowerShell.git
synced 2026-10-17 04:36:39 +00:00
Use Ruby 2.2.1 explicitly on Travis CI OS X
This commit is contained in:
1 parent
3143ccf97c
commit
5f396629f7
2 files changed
+2
-1
No files matched your search
@@ -24,5 +24,6 @@ install:
|
|||||||
- git config --global url.git@github.com:.insteadOf https://github.com/
|
- git config --global url.git@github.com:.insteadOf https://github.com/
|
||||||
- git submodule update --init
|
- git submodule update --init
|
||||||
- (cd tools && ./download.sh)
|
- (cd tools && ./download.sh)
|
||||||
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm use 2.2.1; fi # Default 2.0.0 Ruby is buggy
|
||||||
|
|
||||||
script: ./tools/travis.sh
|
script: ./tools/travis.sh
|
||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
set -x
|
set -x
|
||||||
ulimit -n 4096
|
ulimit -n 4096
|
||||||
# Only build packages for branches, not pull requests
|
# Only build packages for branches, not pull requests
|
||||||
if [[ $TRAVIS_PULL_REQUEST == false ]]; then
|
if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
|
||||||
powershell -c "Import-Module ./build.psm1; Start-PSBootstrap -Package; Start-PSBuild -CrossGen; Start-PSPackage; Start-PSPester; Start-PSxUnit"
|
powershell -c "Import-Module ./build.psm1; Start-PSBootstrap -Package; Start-PSBuild -CrossGen; Start-PSPackage; Start-PSPester; Start-PSxUnit"
|
||||||
else
|
else
|
||||||
powershell -c "Import-Module ./build.psm1; Start-PSBootstrap; Start-PSBuild -CrossGen; Start-PSPester; Start-PSxUnit"
|
powershell -c "Import-Module ./build.psm1; Start-PSBootstrap; Start-PSBuild -CrossGen; Start-PSPester; Start-PSxUnit"
|
||||||
|
|||||||
Reference in new issue
Block a user