diff --git a/.travis.yml b/.travis.yml index ad5238f05..fe8dc5a00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ addons: update: true matrix: include: - - env: SCALA_VERSION=2.12 NATIVE=1 PUBLISH=1 + - env: SCALA_VERSION=2.12 NATIVE=1 os: linux jdk: oraclejdk8 sudo: required @@ -19,13 +19,13 @@ matrix: - curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x services: - docker - - env: SCALA_VERSION=2.11 PUBLISH=1 + - env: SCALA_VERSION=2.11 os: linux jdk: oraclejdk8 sudo: required services: - docker - - env: SCALA_VERSION=2.10 PUBLISH=1 + - env: SCALA_VERSION=2.10 os: linux jdk: oraclejdk8 sudo: required diff --git a/scripts/push-gh-pages-helper.sh b/scripts/push-gh-pages-helper.sh deleted file mode 100755 index c70175c54..000000000 --- a/scripts/push-gh-pages-helper.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [ "$1" = "clone" ]; then - git clone "https://${GH_TOKEN}@github.com/coursier/coursier.git" -b gh-pages coursier-gh-pages >/dev/null 2>&1 -else - git push origin gh-pages >/dev/null 2>&1 -fi diff --git a/scripts/push-gh-pages.sh b/scripts/push-gh-pages.sh deleted file mode 100755 index 9c04f832b..000000000 --- a/scripts/push-gh-pages.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -set -ev - -SCALA_VERSION="$1" -shift - -sbt ++${SCALA_VERSION} web/fastOptJS - -HELPER="$(readlink -f "$(dirname "$0")/push-gh-pages-helper.sh")" - -"$HELPER" clone -cd coursier-gh-pages - -[ ! -e staging ] || git rm -r staging - -mkdir staging -DIR="$(for i in "../web/target/scala-"*; do echo "$i"; done)" -cp "$DIR/web-"*.js* staging -cp "$DIR/classes/index"*.html staging -cp -R "$DIR/classes/css" staging - -for i in staging/*.html; do - mv "$i" "$i.0" - sed "s/src=\"\.\.\/web-/src=\"web-/g" < "$i.0" > "$i" - rm -f "$i.0" -done - -git config user.name "Travis-CI" -git config user.email "invalid@travis-ci.com" -git add staging -git commit -m "Deploy to gh-pages" -"$HELPER" diff --git a/scripts/travis.sh b/scripts/travis.sh index a2c993013..6a9bf7031 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -95,10 +95,6 @@ checkBinaryCompatibility() { sbt scalaFromEnv coreJVM/mimaReportBinaryIssues cacheJVM/mimaReportBinaryIssues } -publish() { - sbt scalaFromEnv publish -} - testBootstrap() { if [ "$SCALA_VERSION" = 2.12 ]; then sbt scalaFromEnv "project cli" pack @@ -221,17 +217,3 @@ else fi fi - -PULL_REQUEST="${PULL_REQUEST:-${TRAVIS_PULL_REQUEST:-false}}" -BRANCH="${BRANCH:-${TRAVIS_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}}" -PUBLISH="${PUBLISH:-0}" - -if [ "$PUBLISH" = 1 -a "$PULL_REQUEST" = false -a "$BRANCH" = master ]; then - publish - - if [ "$SCALA_VERSION" = "2.11" ] && isScalaJs; then - #"$(dirname "$0")/push-gh-pages.sh" "$SCALA_VERSION" - : - fi -fi -