From a73831c4c25e7e61c8d64b35a555e2b151646802 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Fri, 26 Mar 2021 16:16:51 +0000
Subject: [PATCH] Move publish to ci workflow

---
 .github/workflows/ci.yml      | 33 ++++++++++++++++++++++++++++++++-
 .github/workflows/publish.yml | 33 ---------------------------------
 2 files changed, 32 insertions(+), 34 deletions(-)
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a4fd925..948b69b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,8 +12,9 @@ on:
       - master
 
 jobs:
-  build:
 
+  # build and test
+  build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -40,3 +41,33 @@ jobs:
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz
+
+  # if build job succeed, build without tests and publish
+  publish:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - uses: jfrog/setup-jfrog-cli@v1
+      with:
+        version: 1.43.2
+      env:
+        JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+    - name: Configure JFrog Cli
+      run: |
+        jfrog rt gradlec \
+          --use-wrapper \
+          --deploy-ivy-desc=false \
+          --server-id-resolve=repo.spring.io \
+          --server-id-deploy=repo.spring.io \
+          --repo-resolve=snapshot \
+          --repo-deploy=snapshot
+        echo JFROG_CLI_BUILD_NAME=spring-statemachine >> $GITHUB_ENV
+        echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
+    - name: Build and Publish
+      run: |
+        jfrog rt gradle clean build -x test artifactoryPublish
+        jfrog rt build-publish
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index af672c31..00000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Publish
-
-on:
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - uses: jfrog/setup-jfrog-cli@v1
-      with:
-        version: 1.43.2
-      env:
-        JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
-    - name: Configure JFrog Cli
-      run: |
-        jfrog rt gradlec \
-          --use-wrapper \
-          --deploy-ivy-desc=false \
-          --server-id-resolve=repo.spring.io \
-          --server-id-deploy=repo.spring.io \
-          --repo-resolve=snapshot \
-          --repo-deploy=snapshot
-        echo JFROG_CLI_BUILD_NAME=spring-statemachine >> $GITHUB_ENV
-        echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
-    - name: Build and Publish
-      run: |
-        jfrog rt gradle clean build artifactoryPublish
-        jfrog rt build-publish