From 445b5d0f1a01dd2393d907063edc9c5e15b8bc1e Mon Sep 17 00:00:00 2001
From: Bijan Chokoufe Nejad <bijan.nejad@numberfour.eu>
Date: Tue, 18 Aug 2020 15:29:31 +0200
Subject: [PATCH] Refactor workflow

---
 .github/workflows/release.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e1a3d26..5e1f776 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,20 +1,18 @@
-name: Cross Release After Testing
-
+name: Cross Release
 on:
-  create:
-    branches:
-      - 'refs/tags/*'
-
+  push:
+    branches: [master]
+    tags: ["*"]
 jobs:
-  test-and-release:
-
+  publish:
     runs-on: ubuntu-latest
-
     env:
       PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE}}
       GPG_KEYS: ${{ secrets.GPG_KEYS}}
       SONATYPE_SBT: ${{ secrets.SONATYPE_SBT }}
-
+      PGP_SECRET: ${{ secrets.GPG_KEYS }}
+      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      SONATYPE_USERNAME: ${{ secrets.SONATYPE_USER }}
     steps:
       - uses: actions/checkout@v1
       - uses: olafurpg/setup-scala@v2
@@ -26,8 +24,3 @@ jobs:
           echo $SONATYPE_SBT > ~/.sbt/1.0/sonatype.sbt
       - name: Test & Release
         run: sbt ci-release
-        env:
-          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-          PGP_SECRET: ${{ secrets.GPG_KEYS }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USER }}