diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 0000000..c48cc68 --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,28 @@ +name: Check + +on: + pull_request: + + push: + branches: + - 2.8.x # Check 2.8.x branch after merge + +concurrency: + # Only run once for latest commit per ref and cancel other (previous) runs. + group: ci-${{ github.ref }} + cancel-in-progress: true + +jobs: + tests: + name: Tests + uses: playframework/.github/.github/workflows/cmd.yml@v2 + with: + java: 11, 8 + scala: 2.13.8 + cmd: sbt ++$MATRIX_SCALA test g8Test + + finish: + name: Finish + needs: # Should be last + - "tests" + uses: playframework/.github/.github/workflows/rtm.yml@v2 diff --git a/.mergify.yml b/.mergify.yml index 13fff4c..646d7e8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,20 +1,28 @@ +queue_rules: + - name: default + conditions: + # Conditions to get out of the queue (= merged) + - check-success~=/ Ready To Merge$ + pull_request_rules: - name: Merge PRs that are ready conditions: - - status-success=Travis CI - Pull Request - - status-success=typesafe-cla-validator + - check-success~=/ Ready To Merge$ + - check-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: - merge: - method: squash - strict: smart + queue: + method: merge + name: default - name: Delete the PR branch after merge conditions: - merged actions: delete_head_branch: {} + label: + remove: [ "status:merge-when-green" ] diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index def1681..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: scala -scala: 2.13.6 - -env: - - TRAVIS_JDK=8 - - TRAVIS_JDK=11 - -before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh -install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version -script: scripts/test-sbt - -cache: - directories: - - "$HOME/.coursier/cache" - - "$HOME/.ivy2/cache" - - "$HOME/.jabba/jdk" - - "$HOME/.sbt" - -before_cache: - - find $HOME/.ivy2 -name "ivydata-*.properties" -delete - - find $HOME/.sbt -name "*.lock" -delete diff --git a/scripts/test-sbt b/scripts/test-sbt deleted file mode 100755 index 6c0785b..0000000 --- a/scripts/test-sbt +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -echo "+----------------------------+" -echo "| Executing tests using sbt |" -echo "+----------------------------+" - -## This runs the template with the default parameters, and runs test within the templated app. -rm -rf src/main/g8/test # https://github.com/sbt/sbt/issues/630 -sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test g8Test