Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis: rename stage; allow version branches #343

Merged
merged 4 commits into from
Jun 5, 2020
Merged

Travis: rename stage; allow version branches #343

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc83b19
Travis: run validations before testing; allow version branches
ennru May 28, 2020
fbe3e1f
Readme: sbt 1.3, master build status
ennru May 28, 2020
75ef758
No separate validations stage
ennru Jun 3, 2020
5816042
Merge branch 'master' into validate-before-test
mergify[bot] Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx

jobs:
include:
- stage: validations
- stage: test
script: scripts/validate-code.sh
name: "Code validations (headerCheck, scalafmt, mima)"
- name: "Run tests with Scala 2.12 and AdoptOpenJDK 11"

- name: "Run tests with Scala 2.12 and AdoptOpenJDK 11"
script: scripts/test-code.sh
env:
- TRAVIS_SCALA_VERSION=2.12.11
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
script: sbt +publish

stages:
- name: validations
- name: test
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd keep validations and test in a single stage. A silly error in validations will mask further errors in test.

How about splitting the following way:

  • validations and tests-JDK11 (3 jobs in the first stage both scala 2.12 and 2.13)
  • tests-JDK8 (2 extra jobs)
  • other stages

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the wasted Travis jobs I wanted to get rid off, it's now as before.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. I come from maintaining 40+min builds so these wasted travis jobs look like peanuts. :-)

- name: docs
- name: publish
if: tag IS present AND NOT fork
Expand Down Expand Up @@ -87,4 +87,4 @@ notifications:
branches:
only:
- master
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
- /^\d+\.\d+(\.\d+)?(-\S*)?$/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!

4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Twirl [![Latest version](https://index.scala-lang.org/playframework/twirl/twirl-api/latest.svg?color=orange)](https://index.scala-lang.org/playframework/twirl/twirl-api) [![Build Status](https://travis-ci.org/playframework/twirl.svg?branch=v1.1.0)](https://travis-ci.org/playframework/twirl)
# Twirl [![Latest version](https://index.scala-lang.org/playframework/twirl/twirl-api/latest.svg?color=orange)](https://index.scala-lang.org/playframework/twirl/twirl-api) [![Build Status](https://travis-ci.org/playframework/twirl.svg)](https://travis-ci.org/playframework/twirl)

Twirl is the [Play][play-site] [template engine][docs].

Expand All @@ -13,7 +13,7 @@ about the template syntax.
Twirl can also be used outside of Play. An sbt plugin is provided for easy
integration with Scala or Java projects.

> sbt-twirl requires sbt 0.13.5 or higher.
> sbt-twirl requires sbt 1.3.0 or higher.

To add the sbt plugin to your project add the sbt plugin dependency in
`project/plugins.sbt`:
Expand Down