Skip to content
Permalink
Browse files

Merge pull request #1968 from lift/fix-snapshot-builds

Fix snapshot builds

This PR should fix our snapshot building on
master. It will:

* Fix doc generation by fixing up our api
  mappings override for scala-xml
* Disable publishing from jdk11 and jdk12 so
  we don't cause surprises to folks expecting
  Java 8 builds
  • Loading branch information
Shadowfiend committed Jul 21, 2019
2 parents f47a58c + cccb90d commit 12349d947b0cd8243568e8a6d3a600c41135db16
Showing with 5 additions and 3 deletions.
  1. +2 −0 .travis.yml
  2. +1 −1 project/LiftSbtHelpers.scala
  3. +2 −2 travis.sh
@@ -16,8 +16,10 @@ matrix:
include:
- scala: 2.12.8
jdk: openjdk11
env: DISABLE_PUBLISH=true
- scala: 2.12.8
jdk: openjdk12
env: DISABLE_PUBLISH=true
script: ./travis.sh
branches:
only:
@@ -45,7 +45,7 @@ object LiftSbtHelpers {

findManagedDependency(cp, "org.scala-lang.modules", "scala-xml").map {
case (revision, file) =>
(file -> url("http://www.scala-lang.org/api/" + version))
(file -> url("https://scala.github.io/scala-xml/api/" + revision))
}.toMap
}
)
@@ -1,12 +1,12 @@
#!/bin/bash

set -ev
set -e

sbt ++$TRAVIS_SCALA_VERSION test

./npmsh

if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ -z "$DISABLE_PUBLISH" ]; then
mkdir -p ~/.sbt/1.0/
openssl aes-256-cbc -K $encrypted_a177bbd76133_key -iv $encrypted_a177bbd76133_iv -in .credentials.enc -out ~/.sbt/1.0/.credentials -d

0 comments on commit 12349d9

Please sign in to comment.
You can’t perform that action at this time.