From 85255acd9954c801f10e2c40cf594360ab4fad22 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Wed, 18 May 2022 15:10:27 +0200
Subject: [PATCH] GitHub actions last round + badges

---
 .github/workflows/build-test.yml |  9 ++++++---
 .github/workflows/publish.yml    |  4 +++-
 README.md                        | 16 +++++++++++++++-
 build.sbt                        |  2 --
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 5ad605bc..db67290a 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -1,10 +1,12 @@
 name: Check
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
 
+  push:
+    branches:
+      - main # Check branch after merge
+
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
   group: ci-${{ github.ref }}
@@ -31,7 +33,7 @@ jobs:
 
   tests:
     name: Tests
-    needs: # Waiting more lightweight checks
+    needs:
       - "check-code-style"
       - "check-binary-compatibility"
       - "check-docs"
@@ -43,6 +45,7 @@ jobs:
 
   finish:
     name: Finish
+    if: github.event_name == 'pull_request'
     needs: # Should be last
       - "tests"
     uses: playframework/.github/.github/workflows/rtm.yml@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 79951079..9e999302 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,7 +4,9 @@ on:
   push:
     branches: # Snapshots
       - main
-    tags: ["*"] # Releases
+    tags: ["**"] # Releases
+  release:
+    types: [published]
 
 jobs:
   publish-artifacts:
diff --git a/README.md b/README.md
index c23fcdf3..9dd6b38b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,18 @@
-# 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
+
+[![Twitter Follow](https://img.shields.io/twitter/follow/playframework?label=follow&style=flat&logo=twitter&color=brightgreen)](https://twitter.com/playframework)
+[![Discord](https://img.shields.io/discord/931647755942776882?logo=discord&logoColor=white)](https://discord.gg/g5s2vtZ4Fa)
+[![GitHub Discussions](https://img.shields.io/github/discussions/playframework/playframework?&logo=github&color=brightgreen)](https://github.com/playframework/playframework/discussions)
+[![StackOverflow](https://img.shields.io/static/v1?label=stackoverflow&logo=stackoverflow&logoColor=fe7a16&color=brightgreen&message=playframework)](https://stackoverflow.com/tags/playframework)
+[![YouTube](https://img.shields.io/youtube/channel/views/UCRp6QDm5SDjbIuisUpxV9cg?label=watch&logo=youtube&style=flat&color=brightgreen&logoColor=ff0000)](https://www.youtube.com/channel/UCRp6QDm5SDjbIuisUpxV9cg)
+[![Twitch Status](https://img.shields.io/twitch/status/playframework?logo=twitch&logoColor=white&color=brightgreen&label=live%20stream)](https://www.twitch.tv/playframework)
+[![OpenCollective](https://img.shields.io/opencollective/all/playframework?label=financial%20contributors&logo=open-collective)](https://opencollective.com/playframework)
+
+[![Build Status](https://github.com/playframework/twirl/actions/workflows/build-test.yml/badge.svg)](https://github.com/playframework/twirl/actions/workflows/build-test.yml)
+[![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/twirl-api_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/com.typesafe.play/twirl-api_2.13)
+[![Repository size](https://img.shields.io/github/repo-size/playframework/twirl.svg?logo=git)](https://github.com/playframework/twirl)
+[![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
+[![Mergify Status](https://img.shields.io/endpoint.svg?url=https://api.mergify.com/v1/badges/playframework/twirl&style=flat)](https://mergify.com)
 
 Twirl is the [Play][play-site] [template engine][docs].
 
diff --git a/build.sbt b/build.sbt
index 45e39eef..82ec3438 100644
--- a/build.sbt
+++ b/build.sbt
@@ -34,8 +34,6 @@ val mimaSettings = Seq(
   )
 )
 
-ThisBuild / sonatypeProfileName := "com.typesafe.play"
-
 // Customise sbt-dynver's behaviour to make it work with tags which aren't v-prefixed
 ThisBuild / dynverTagPrefix := ""