From ea930d3346286c4511b30fa0df7d9a29cf6b8919 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 18 Jul 2016 12:13:46 -0700 Subject: [PATCH 1/2] Remove Slack CI notifications --- .travis.yml | 3 --- appveyor.yml | 5 ----- 2 files changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 036ff22a6..9f559ae7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,3 @@ install: - (cd tools && ./download.sh) script: - ulimit -n 4096; powershell -c "Import-Module ./build.psm1; Start-PSBootstrap -Package; Start-PSBuild -Publish; Start-PSPackage; Start-PSPester; Start-PSxUnit" -notifications: - slack: - secure: sKYd4n61+ZFzGZuWGUl8V1kN0NM16wRVOFVlNhlFCwnkrEsKROb++EvXf5uwnKuzxkhEjvPWO+UFgeshQDoR93y4s5YLfhC5JupK4nUzjPzWs208KTrh8u/x9MY8X6Ojxi85EEAiku5GzMoMlkucSStZUYwbIfnelzqdw8uoRwmm2MW4XCPwsuEuDUVghyiva0Mdx1G6MopCrK8T96WywJXT3chhfZQgVt+sQCBt9g+2kjDaObKrzG0P07IVK43ZpDgnu6AoxlyBzIx9mJH2Oa/tki3/kTO72Wcp3ps3qvmiStADamzVKR9p1VlWCLWAd6VOehxuByCGEyujpzk135Wud2DZYO+8LD6inZVhFe3Wt5pCU9BDXZppiATfMCqgXEH7nK54pEn79yHcjthRJ2+Z9ot7As2fu3RSBmTAi8nRP0fxRyX/jctR3S6P0qt0y1ynx9nzBfhmhPQW0PMVazWS/nruQIvK/3iiYXjZxM5bBwIvabmwV00EYeTdbL6ufXWNgQcG1ZWkDsi2I3vst/ytUbHwaFYg83bXWpxg9DCzJeWLVUvE5/3NfBxRAuCTot/fgTEA9IYScvrlL7Q/bT0cOt0vEM98MPf1UO+WP85uxhsRgHtwDEo+jMaL6ZFkPhlV6mmmED4NdY2//a571cLNXdnuMAze5O3TWGBG53g= diff --git a/appveyor.yml b/appveyor.yml index 477221cf7..c33a35031 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,11 +10,6 @@ environment: priv_key: secure: -notifications: - - provider: Slack - incoming_webhook: - secure: bwwXBTeJBtRFea6FSQKzVENLwL0AOeusUSUFIh/TeHA4y0UFk7bC9+OcxgZW+YfIC0VZyTpZClJHlPFFHSgiQs4g9om17RxzJEeq4EjsW5g= - install: - ps: $fileContent = "-----BEGIN RSA PRIVATE KEY-----`n" - ps: $fileContent += $env:priv_key.Replace(' ', "`n") From af9c4cb6737144af02f26dc4e18b5265da4f162a Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 18 Jul 2016 12:21:55 -0700 Subject: [PATCH 2/2] Don't build packages for pull requests Since we don't want to build packages for pull requests (as they cannot get archived as artifacts), we need a slightly different build command, and moving it to a script was cleaner. --- .travis.yml | 8 ++++++-- tools/travis.sh | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 tools/travis.sh diff --git a/.travis.yml b/.travis.yml index 9f559ae7e..b4b2f1717 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,19 +9,23 @@ osx_image: xcode8 env: - GITHUB_TOKEN=a27573e27bea23fb05393ead69511b09e3b224be + cache: directories: - $HOME/.dotnet - $HOME/.nuget + addons: artifacts: s3_region: "us-west-2" paths: $(ls powershell*{deb,pkg} | tr "\n" ":") + git: submodules: false + install: - git config --global url.git@github.com:.insteadOf https://github.com/ - git submodule update --init - (cd tools && ./download.sh) -script: - - ulimit -n 4096; powershell -c "Import-Module ./build.psm1; Start-PSBootstrap -Package; Start-PSBuild -Publish; Start-PSPackage; Start-PSPester; Start-PSxUnit" + +script: ./tools/travis.sh diff --git a/tools/travis.sh b/tools/travis.sh new file mode 100755 index 000000000..bcbc560a1 --- /dev/null +++ b/tools/travis.sh @@ -0,0 +1,7 @@ +ulimit -n 4096 +# Only build packages for branches, not pull requests +if [[ $TRAVIS_PULL_REQUEST == false ]]; then + powershell -c "Import-Module ./build.psm1; Start-PSBootstrap -Package; Start-PSBuild -Publish; Start-PSPackage; Start-PSPester; Start-PSxUnit" +else + powershell -c "Import-Module ./build.psm1; Start-PSBootstrap; Start-PSBuild; Start-PSPester; Start-PSxUnit" +fi