Merge pull request #62 from Banno/fix-changelog

Fix changelog
Banno · Aug 25, 2020 · e753609 · e753609
2 parents f6c8a61 + 4e6251e
commit e753609
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,25 +37,6 @@ jobs:
         tag: ${{ env.newTag }}
         message: ${{ env.newTag }}
 
-    - name: Generate Changelog
-      id: generate_changelog
-      uses: nblagoev/[email protected]
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        base-ref: ${{ env.previousTag }}
-        head-ref: ${{ env.newTag }}
-
-    - name: Draft Release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ env.newTag }}
-        release_name: ${{ env.newTag }}
-        body: ${{steps.generate_changelog.outputs.result}}
-        draft: true
-
     - id: next_version
       uses: jessicalostinspace/[email protected]
       with:
@@ -76,3 +57,22 @@ jobs:
       with:
         add: gordon-plugin/gradle.properties
         message: Bump version to ${{steps.next_version.outputs.bumped-semantic-version}}
+
+    - name: Generate Changelog
+      id: generate_changelog
+      uses: nblagoev/[email protected]
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        base-ref: ${{ env.previousTag }}
+        head-ref: HEAD
+
+    - name: Draft Release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ env.newTag }}
+        release_name: ${{ env.newTag }}
+        body: ${{steps.generate_changelog.outputs.result}}
+        draft: true
diff --git a/gordon-plugin/gradle.properties b/gordon-plugin/gradle.properties
@@ -1,2 +1,2 @@
 group=com.banno.gordon
-version=1.4.5
+version=1.5.0