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.

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

Drop Travis CI #644

Merged
merged 1 commit into from
Jan 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 0 additions & 36 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: Pull Requests

on:
pull_request:
branches:
- main
- 2.1.x

concurrency:
# Only run once for latest commit per ref and cancel other (previous) runs.
Expand Down Expand Up @@ -76,7 +73,6 @@ jobs:
run: sbt doc

tests:
if: ${{ github.base_ref != '2.1.x' }}
Copy link
Member Author

Choose a reason for hiding this comment

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

Don't need now

runs-on: ubuntu-20.04
needs: # Waiting more lightweight checks
- "check-code-style"
Expand Down Expand Up @@ -106,35 +102,3 @@ jobs:
run: sbt ++$SCALA_VERSION 'testOnly -- xonly timefactor 5'
env:
SCALA_VERSION: ${{ matrix.scala }}

Copy link
Member Author

Choose a reason for hiding this comment

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

Moved to 2.1.x branch

tests-21x:
if: ${{ github.base_ref == '2.1.x' }}
runs-on: ubuntu-20.04
needs: # Waiting more lightweight checks
- "check-code-style"
- "check-binary-compatibility"
- "check-docs"
strategy:
matrix:
jdk: [ 11, 8 ]
scala: [ 2.12.15, 2.13.8 ] # Should be sync with Mergify conditions (.mergify.yml)
name: Check / Tests (Scala ${{ matrix.scala }} & JDK ${{ matrix.jdk }})
steps:
- name: Checkout
uses: actions/checkout@v2
with:
# we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
fetch-depth: 0

- name: Set up JDK ${{ matrix.jdk }}
uses: olafurpg/setup-scala@v13
with:
java-version: adopt@1.${{ matrix.jdk }}

- name: Cache Coursier cache
uses: coursier/cache-action@v6.2

- name: Tests
run: sbt ++$SCALA_VERSION 'testOnly -- xonly timefactor 5'
env:
SCALA_VERSION: ${{ matrix.scala }}
2 changes: 0 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ on:
push:
branches: # Snapshots
- main
# - 2.1.x # TODO: 2.1.x don't support sbt-ci-release yet
Copy link
Member Author

Choose a reason for hiding this comment

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

Don't need now

tags: ["*"] # Releases
tags-ignore: [ "2.1.*" ] # TODO: 2.1.x don't support sbt-ci-release yet

jobs:
publish-artifacts:
Expand Down
38 changes: 1 addition & 37 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,9 @@ queue_rules:
- check-success=Check / Docs
- check-success~=^Check / Tests \(Scala 2\.13\.(\d+) & JDK 11\)$
- check-success~=^Check / Tests \(Scala 2\.13\.(\d+) & JDK 8\)$
- name: 2-1-x
Copy link
Member Author

Choose a reason for hiding this comment

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

Second queue don't support in free version Mergify 😞

conditions:
# Conditions to get out of the queue (= merged)
- check-success=Check / Code Style
- check-success=Check / Binary Compatibility
- check-success=Check / Docs
- check-success~=^Check / Tests \(Scala 2\.12\.(\d+) & JDK 11\)$
- check-success~=^Check / Tests \(Scala 2\.12\.(\d+) & JDK 8\)$
- check-success~=^Check / Tests \(Scala 2\.13\.(\d+) & JDK 11\)$
- check-success~=^Check / Tests \(Scala 2\.13\.(\d+) & JDK 8\)$


pull_request_rules:
- name: Merge PRs for 2.1.x branch that are ready
conditions:
- base==2.1.x
- status-success=Travis CI - Pull Request
- check-success=Check / Code Style
- check-success=Check / Binary Compatibility
- check-success=Check / Docs
- check-success~=^Check / Tests \(Scala 2\.12\.(\d+) & JDK 11\)$
- check-success~=^Check / Tests \(Scala 2\.12\.(\d+) & JDK 8\)$
- check-success~=^Check / Tests \(Scala 2\.13\.(\d+) & JDK 11\)$
- check-success~=^Check / Tests \(Scala 2\.13\.(\d+) & JDK 8\)$
- status-success=typesafe-cla-validator
- "#approved-reviews-by>=1"
- "#review-requested=0"
- "#changes-requested-reviews-by=0"
- label!=status:block-merge
- label=status:merge-when-green
actions:
queue:
method: merge
name: 2-1-x

- name: Merge PRs (except 2.1.x branch) that are ready
- name: Merge PRs that are ready
conditions:
- base!=2.1.x
- status-success=Travis CI - Pull Request
- check-success=Check / Code Style
- check-success=Check / Binary Compatibility
- check-success=Check / Docs
Expand Down
41 changes: 0 additions & 41 deletions .travis.yml

This file was deleted.

4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[![Build Status](https://travis-ci.com/playframework/play-ws.svg?branch=main)](https://travis-ci.com/github/playframework/play-ws) [![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/play-ws-standalone_2.13.svg)](http://mvnrepository.com/artifact/com.typesafe.play/play-ws-standalone_2.13) [![Javadocs](https://javadoc.io/badge/com.typesafe.play/play-ws-standalone_2.13.svg)](https://javadoc.io/doc/com.typesafe.play/play-ws-standalone_2.13)
[![Build Status](https://github.com/playframework/play-ws/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/playframework/play-ws/actions/workflows/publish.yml)
[![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/play-ws-standalone_2.13.svg)](http://mvnrepository.com/artifact/com.typesafe.play/play-ws-standalone_2.13)
[![Javadocs](https://javadoc.io/badge/com.typesafe.play/play-ws-standalone_2.13.svg)](https://javadoc.io/doc/com.typesafe.play/play-ws-standalone_2.13)

# Play WS Standalone

Expand Down
4 changes: 2 additions & 2 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ This is released from the `main` branch from `2.2.0` forward. Unless an older ve
### Requires contributor access

- Check the [draft release notes](https://github.com/playframework/play-ws/releases) to see if everything is there
- Wait until [main branch build finishes](https://travis-ci.com/github/playframework/play-ws/builds) after merging the last PR
- Wait until [main branch build finishes](https://github.com/playframework/play-ws/actions/workflows/publish.yml) after merging the last PR
- Update the [draft release](https://github.com/playframework/play-ws/releases) with the next tag version (eg. `2.2.0`), title and release description
- Check that Travis CI release build has executed successfully (Travis will start a [CI build](https://travis-ci.com/github/playframework/play-ws/builds) for the new tag and publish artifacts to Sonatype)
- Check that GitHub Actions release build has executed successfully (GA start a [CI build](https://github.com/playframework/play-ws/actions/workflows/publish.yml) for the new tag and publish artifacts to Sonatype)

### Check Maven Central

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/test/resources/logback-test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<!-- We use short exception stack trace logging to limit output for travis. -->
<!-- We use short exception stack trace logging to limit output for CI. -->
<!-- Change to full if you need to do further debugging, but never commit that. -->
<pattern>%level %logger{15} - %message%n%ex{short}</pattern>
</encoder>
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import sbt._

object Dependencies {

// must align with versions in .travis.yml
val scala213 = "2.13.7"
// Should be sync with GA (.github/workflows/build-test.yml)
val scala213 = "2.13.8"

val logback = Seq("ch.qos.logback" % "logback-core" % "1.2.10")

Expand Down