Skip to content

Commit

Permalink
Make Appveyor and TravisCI open for reviewing (#71)
Browse files Browse the repository at this point in the history
* Make Appveyor and TravisCI open for reviewing

* changed powershell process name pwsh on core

* Added nightly Appveryor run
  • Loading branch information
jianyunt committed Nov 10, 2017
1 parent 247e287 commit 2fe4b64
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 16 deletions.
21 changes: 11 additions & 10 deletions .travis.yml
Expand Up @@ -9,7 +9,7 @@ os:
- osx
sudo: required
dist: trusty
osx_image: xcode7.3
osx_image: xcode8.1

matrix:
allow_failures:
Expand All @@ -21,18 +21,19 @@ addons:
artifacts:
paths: $(ls ./../SHiPS.coreclr.zip | tr "\n" ":")


install:
- export PATH=~/.dotnet:$PATH
- pushd tools
- chmod +x download.sh
- chmod +x travis.sh
- ./download.sh
- popd
- export PATH=~/.dotnet:$PATH
# Default 2.0.0 Ruby is buggy
# Default bundler version is buggy
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm install ruby-2.3.1; rvm use 2.3.1; gem uninstall bundler -v1.13.1; fi

- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
rvm install ruby-2.3.3;
rvm --default use 2.3.3;
fi
- bash <(wget -O - https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh)
- pushd tools
- chmod +x travis.sh
- popd

script:
- echo "TRAVIS_EVENT_TYPE value $TRAVIS_EVENT_TYPE"
- ./tools/travis.sh
Expand Down
29 changes: 26 additions & 3 deletions README.md
Expand Up @@ -7,15 +7,38 @@ To be more precise it's a provider utility that simplifies developing PowerShell

## Build Status

### Development branch

| AppVeyor (Windows) | Travis CI (Linux / macOS) |
|--------------------------|--------------------------|
| [![av-image-dev][]][av-site-dev] | [![tv-image-dev][]][tv-site-dev] |


### Master branch
| AppVeyor (Windows) | Travis CI (Linux / macOS) |
|--------------------------|--------------------------|
| [![av-image-master][]][av-site-master] | [![tv-image-master][]][tv-site-master] |

[av-image-master]: https://ci.appveyor.com/api/projects/status/4n9486v38x2tw2su/branch/master?svg=true
[av-image-master]: https://ci.appveyor.com/api/projects/status/5l52pip0e792m6xo/branch/master?svg=true
[av-site-master]: https://ci.appveyor.com/project/PowerShell/SHiPS/branch/master
[tv-image-master]: https://travis-ci.org/PowerShell/SHiPS.svg?branch=master
[tv-site-master]: https://travis-ci.org/PowerShell/SHiPS/branches

[av-image-dev]:https://ci.appveyor.com/api/projects/status/5l52pip0e792m6xo/branch/development?svg=true
[av-site-dev]: https://ci.appveyor.com/project/PowerShell/SHiPS/branch/development
[tv-image-dev]: https://travis-ci.org/PowerShell/SHiPS.svg?branch=development
[tv-site-dev]: https://travis-ci.org/PowerShell/SHiPS/branches

### Nightly run Master branch


| AppVeyor (Windows)
|--------------------------
| [![av-image-master-n][]][av-site-master-n]

[av-image-master-n]: https://ci.appveyor.com/api/projects/status/t5t7lgy1spfrf1ai/branch/master?svg=true
[av-site-master-n]: https://ci.appveyor.com/project/PowerShell/SHiPS/branch/master

[tv-image-master]: https://api.travis-ci.com/PowerShell/SHiPS.svg?token=mtYTwKyARGmyq9Xsqq7h&branch=master
[tv-site-master]: https://travis-ci.com/PowerShell/SHiPS/builds

## Supported Platform

Expand Down
2 changes: 1 addition & 1 deletion tools/setup.psm1
Expand Up @@ -170,7 +170,7 @@ function Invoke-SHiPSTest {
}
} else {
# On Linux tests run against the pscore from its official release package
$PowerShellExePath = 'powershell'
$PowerShellExePath = 'pwsh'
}


Expand Down
4 changes: 2 additions & 2 deletions tools/travis.sh
Expand Up @@ -7,6 +7,6 @@ echo "TRAVIS_EVENT_TYPE value $TRAVIS_EVENT_TYPE"
git submodule update --init


powershell -c "cd src; ./bootstrap.ps1; ./build.ps1 -framework "netcoreapp2.0" Release"
pwsh -c "cd src; ./bootstrap.ps1; ./build.ps1 -framework "netcoreapp2.0" Release"

sudo powershell -c "Import-Module ./tools/setup.psm1; Invoke-SHiPSTest"
sudo pwsh -c "Import-Module ./tools/setup.psm1; Invoke-SHiPSTest"

0 comments on commit 2fe4b64

Please sign in to comment.