From 57ee96a739125c3032f3d243fc3c8b922f7a229e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 21 Apr 2020 13:25:55 +0200
Subject: [PATCH] Merging CI workflows

---
 .github/workflows/build.yml   | 56 +++++++++++++++++++++-
 .github/workflows/release.yml | 90 -----------------------------------
 2 files changed, 55 insertions(+), 91 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7bc9c1ebf..6574db83c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,4 +62,58 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: buildkit-win.zip
-          path: main/buildkit/target/buildkit-win.zip
\ No newline at end of file
+          path: main/buildkit/target/buildkit-win.zip
+          
+  github-release:
+    name: Draft a Release on GitHub Releases
+    runs-on: ubuntu-latest
+    needs: assemble-build-kit
+    # if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - name: Download buildkit-linux.zip
+        uses: actions/download-artifact@v1
+        with:
+          name: buildkit-linux.zip
+      - name: Download buildkit-mac.zip
+        uses: actions/download-artifact@v1
+        with:
+          name: buildkit-mac.zip
+      - name: Download buildkit-win.zip
+        uses: actions/download-artifact@v1
+        with:
+          name: buildkit-win.zip
+      - id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          draft: true
+          prerelease: true
+      - name: Upload buildkit-linux.zip to GitHub Releases
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: buildkit-linux.zip
+          asset_name: buildkit-linux.zip
+          asset_content_type: application/zip
+      - name: Upload buildkit-mac.zip to GitHub Releases
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: buildkit-mac.zip
+          asset_name: buildkit-mac.zip
+          asset_content_type: application/zip
+      - name: Upload buildkit-win.zip to GitHub Releases
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: buildkit-win.zip
+          asset_name: buildkit-win.zip
+          asset_content_type: application/zip
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 9bff2d86a..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-name: Create Release
-
-on:
-  [push]
-
-jobs:
-  build:
-    name: Assemble Build Kit
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 14
-        uses: actions/setup-java@v1
-        with:
-          java-version: 14
-      - uses: actions/cache@v1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ github.run_id }}
-      - name: Build with Maven
-        run: mvn -B package --file main/pom.xml -Prelease
-      - name: Upload buildkit-linux.zip
-        uses: actions/upload-artifact@v1
-        with:
-          name: buildkit-linux.zip
-          path: main/buildkit/target/buildkit-linux.zip
-      - name: Upload buildkit-mac.zip
-        uses: actions/upload-artifact@v1
-        with:
-          name: buildkit-mac.zip
-          path: main/buildkit/target/buildkit-mac.zip
-      - name: Upload buildkit-win.zip
-        uses: actions/upload-artifact@v1
-        with:
-          name: buildkit-win.zip
-          path: main/buildkit/target/buildkit-win.zip
-        
-  github_release:
-    name: Draft a Release via GitHub Releases
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Download buildkit-linux.zip
-        uses: actions/download-artifact@v1
-        with:
-          name: buildkit-linux.zip
-      - name: Download buildkit-mac.zip
-        uses: actions/download-artifact@v1
-        with:
-          name: buildkit-mac.zip
-      - name: Download buildkit-win.zip
-        uses: actions/download-artifact@v1
-        with:
-          name: buildkit-win.zip
-      - id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          draft: true
-          prerelease: true
-      - name: Upload buildkit-linux.zip to GitHub Releases
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: buildkit-linux.zip
-          asset_name: buildkit-linux.zip
-          asset_content_type: application/zip
-      - name: Upload buildkit-mac.zip to GitHub Releases
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: buildkit-mac.zip
-          asset_name: buildkit-mac.zip
-          asset_content_type: application/zip
-      - name: Upload buildkit-win.zip to GitHub Releases
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: buildkit-win.zip
-          asset_name: buildkit-win.zip
-          asset_content_type: application/zip
-     
\ No newline at end of file