Merge pull request #19 from devgateway/task/DVIZ-24/admin-docker-optimization

Task/dviz 24/admin docker optimization

Author: timothygachengo

.github/workflows/release.yml

@@ -13,15 +13,17 @@ permissions:
   packages: write
 
 jobs:
-  release-and-tag:
+  prepare-a-release:
     runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.release.outputs.version }}
+      new_version: ${{ steps.tag_version.outputs.new_version }}
+      new_tag: ${{ steps.tag_version.outputs.new_tag }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
           fetch-depth: '0'
+
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -62,20 +64,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate Tag
+        id: tag_version
         uses: mathieudutour/github-tag-action@v6.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           release_branches: 'master,main,release/*'
-
-
-
-      - uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.tag_version.outputs.new_tag || '1.0.0' }}
-          name: Release ${{ steps.tag_version.outputs.new_tag || '1.0.0' }}
-          generateReleaseNotes: 'true'
-          bodyFile: CHANGELOG.md
-          artifacts: forms/target/*.jar
+          tag_prefix: 'v'
+          dry_run: 'true'
 
   build-and-push-docker-image:
     needs: release-and-tag
@@ -108,8 +103,25 @@ jobs:
           context: .
           push: true
           build-args: |
-            VERSION=${{ needs.release-and-tag.outputs.version }}
-            TAG=${{ needs.release-and-tag.outputs.version }}
+            VERSION=${{ needs.release-and-tag.outputs.new_version }}
+            TAG=${{ needs.release-and-tag.outputs.new_version }}
           tags: |
             ${{ vars.DOCKER_REGISTRY }}/data-viz-admin:latest
-            ${{ vars.DOCKER_REGISTRY }}/data-viz-admin:v${{ needs.release-and-tag.outputs.version }}
+            ${{ vars.DOCKER_REGISTRY }}/data-viz-admin:v${{ needs.release-and-tag.outputs.new_version }}
+    
+  release-on-github:
+    needs: build-and-push-docker-image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ needs.release-and-tag.outputs.new_tag }}
+          files: forms/target/deps/*.jar
+          body_path: CHANGELOG.md
+          draft: false
+          prerelease: false
+          make_latest: 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cliff.toml

@@ -46,6 +46,8 @@ body = """
 # template for the changelog footer
 footer = """
 \n
+Full changelog is available at \
+[{{ remote.github.owner }}/{{ remote.github.repo }}]/{{release.version}}\n
 Developed by Development Gateway
 """
 # remove the leading and trailing whitespace from the templates