From 3b75ebd6e433477641d17fc4dd4991198c1fb2d1 Mon Sep 17 00:00:00 2001
From: Michael Bull <mikebull94@gmail.com>
Date: Sat, 30 Jan 2021 17:00:12 +0000
Subject: [PATCH] Merge ci & publish workflows

---
 .github/workflows/ci.yaml      | 38 ++++++++++++++++++++++++++++++++--
 .github/workflows/publish.yaml | 36 --------------------------------
 2 files changed, 36 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/publish.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6865522..c77da0b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,9 +1,9 @@
 name: ci
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
-  build:
+  check:
     runs-on: ubuntu-latest
 
     steps:
@@ -28,3 +28,37 @@ jobs:
           java-version: 1.8
 
       - run: ./gradlew check
+
+  publish:
+    needs: check
+    if: github.ref == 'master' && github.event_name != 'pull_request' && needs.check.result == 'success'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/cache@v1
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-wrapper-
+
+      - uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('buildSrc/src/main/kotlin/Versions.kt') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-caches-
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - run: ./gradlew publish
+        env:
+          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }}
+          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
deleted file mode 100644
index 95c555e..0000000
--- a/.github/workflows/publish.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: publish
-
-on: [ push ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-wrapper-
-
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('buildSrc/src/main/kotlin/Versions.kt') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-caches-
-
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
-      - run: ./gradlew publish
-        env:
-          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }}
-          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}