From 3884564516451ff23cd54be338a85ebacd98f086 Mon Sep 17 00:00:00 2001
From: graemerocher <graeme.rocher@gmail.com>
Date: Fri, 13 Dec 2019 09:12:43 +0100
Subject: [PATCH] Prepare release.yml

---
 .github/workflows/gradle.yml  |  4 +-
 .github/workflows/release.yml | 90 +++++++++++++++++++++--------------
 gradle/publishing.gradle      |  2 +-
 3 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 41cd2b2bd27..84134b062aa 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -27,13 +27,13 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew check --no-daemon --parallel --continue
     - name: Publish to JFrog OSS
-      if: success() && github.event_name == 'push' && matrix.java == '1.8'
+      if: success() && github.event_name == 'push' && matrix.java == '8'
       env:
          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
          BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
       run: ./gradlew publish docs --no-daemon
     - name: Publish to Github Pages
-      if: success() && github.event_name == 'push' && matrix.java == '1.8'
+      if: success() && github.event_name == 'push' && matrix.java == '8'
       uses: micronaut-projects/micronaut-docs-deploy@master
       env:
         GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bf4f00ebf11..8dfd56ff38b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,39 +13,57 @@ jobs:
       with:
         java-version: 1.8
         ref: ${{ github.head_ref }}
-#    - name: Publish to Bintray
-#      env:
-#         BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-#         BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
-#      run: ./gradlew assemble bintrayUpload docs
-#    - id: release_version
-#      run: echo ::set-output name=release_version::${GITHUB_REF:11}
-#    - name: Create Release
-#        id: create_release
-#        uses: actions/create-release@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-#        with:
-#          tag_name: ${{ github.ref }}
-#          release_name: Micronaut ${{ steps.release_version.outputs.release_version }}
-#          body: |
-#            Changes in this Release
-#            - First Change
-#            - Second Change
-#          draft: false
-#          prerelease: false
-#    - name: Publish to Github Pages
-#      if: success()
-#      uses: micronaut-projects/github-pages-deploy-action@master
-#      env:
-#        GH_TOKEN: ${{ secrets.GH_TOKEN }}
-#        BASE_BRANCH: master
-#        BRANCH: gh-pages
-#        FOLDER: build/docs
-#        VERSION: ${{ steps.release_version.outputs.release_version }}
-#    - name: Synchronize Maven Central
-#      if: success()
-#      env:
-#         BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-#         BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
-#      run: ./gradlew sWMC
+    - name: Publish to Bintray
+      env:
+         BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+         BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
+      run: ./gradlew assemble bintrayUpload docs --no-daemon
+    - id: release_version
+      if: success()
+      run: echo ::set-output name=release_version::${GITHUB_REF:11}
+    - name: Create Release
+        id: create_release
+        if: success()
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Micronaut ${{ steps.release_version.outputs.release_version }}
+          body: |
+            Micronaut ${{ steps.release_version.outputs.release_version }}
+            - What's New: https://docs.micronaut.io/${{ steps.release_version.outputs.release_version }}/guide/index.html#whatsNew
+            - Issues Closed:  https://github.com/micronaut-projects/micronaut-core/milestone/TODO?closed=1
+          draft: false
+          prerelease: false
+    - name: Upload Release
+      if: success()
+      id: upload-release-asset
+      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: cli/build/distributions/micronaut-${{ steps.release_version.outputs.release_version }}.zip
+        asset_name: micronaut-${{ steps.release_version.outputs.release_version }}.zip
+        asset_content_type: application/zip
+    - name: SDKMan Announce
+      if: success()
+      run: ./gradlew sdkMinorRelease
+    - name: Publish to Github Pages
+      if: success()
+      uses: micronaut-projects/micronaut-docs-deploy@master
+      env:
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        GH_REPOSITORY: micronaut-projects/micronaut-docs
+        BASE_BRANCH: master
+        BRANCH: gh-pages
+        FOLDER: build/docs
+        BETA: true
+        VERSION: ${{ steps.release_version.outputs.release_version }}
+    - name: Synchronize Maven Central
+      if: success()
+      env:
+         BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+         BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
+      run: ./gradlew sWMC
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 92fb7b4d1df..960114d7d64 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -200,7 +200,7 @@ bintray {
     user = bintrayUser
     key = bintrayKey
     publications = ['maven']
-    publish = false
+    publish = true
     pkg {
         repo = 'core-releases-local'
         userOrg = 'micronaut'