Fixed workflows

Author: likespro

.github/workflows/main-branch.yml

@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  build-jar:
+  build-jars:
     runs-on: ubuntu-latest
 
     steps:
@@ -22,9 +22,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - name: Change wrapper permissions
-        run: chmod +x ./gradlew
-
       - name: Build with Gradle Wrapper
         run: ./gradlew build
 

.github/workflows/release-branch.yml

@@ -6,7 +6,7 @@ on:
       - release/*
 
 jobs:
-  build-jar:
+  build-jars:
     runs-on: ubuntu-latest
 
     steps:
@@ -22,9 +22,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - name: Change wrapper permissions
-        run: chmod +x ./gradlew
-
       - name: Build with Gradle Wrapper
         run: ./gradlew build
 
@@ -43,7 +40,7 @@ jobs:
       - name: Upload jars
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.ref_name }}-jars
+          name: ${{ env.PROJECT_NAME }}-${{ env.VERSION }}-jars
           path: build/libs/*.jar
 
   build-and-push-docker:
@@ -87,7 +84,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}, "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
+          tags: ${{ steps.meta.outputs.tags }}, ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Generate artifact attestation
@@ -130,43 +127,58 @@ jobs:
         run: |
           helm package ./helm --destination ./chart
 
-      - name: Read Helm Chart
-        id: helm-chart-reader
-        uses: jacobtomlinson/[email protected]
-        with:
-          path: ./chart/*
+      - name: Extract project name from Gradle
+        id: extract_name
+        run: |
+          PROJECT_NAME=$(./gradlew -q printProjectName)
+          echo "PROJECT_NAME=${PROJECT_NAME}" >> $GITHUB_ENV
+
+      - name: Extract version from Gradle
+        id: get-version
+        run: |
+          VERSION=$(./gradlew -q printProjectVersion)
+          echo "VERSION=${VERSION}" >> $GITHUB_ENV
 
       - name: Upload Helm Chart
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.ref_name }}-helm-chart
+          name: ${{ env.PROJECT_NAME }}-${{ env.VERSION }}-helm-chart
           path: build/libs/*.tgz
 
   create-release:
     runs-on: ubuntu-latest
+    needs:
+      - build-jars
+      - package-and-push-helm
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Extract project name from Gradle
+        id: extract_name
+        run: |
+          PROJECT_NAME=$(./gradlew -q printProjectName)
+          echo "PROJECT_NAME=${PROJECT_NAME}" >> $GITHUB_ENV
+
+      - name: Extract version from Gradle
+        id: get-version
+        run: |
+          VERSION=$(./gradlew -q printProjectVersion)
+          echo "VERSION=${VERSION}" >> $GITHUB_ENV
+
       - name: Download jars
         uses: actions/download-artifact@v4
         with:
-          name: ${{ github.ref_name }}-jars
+          name: ${{ env.PROJECT_NAME }}-${{ env.VERSION }}-jars
           path: artifacts/
 
       - name: Download Helm Chart
         uses: actions/download-artifact@v4
         with:
-          name: ${{ github.ref_name }}-helm-chart
+          name: ${{ env.PROJECT_NAME }}-${{ env.VERSION }}-helm-chart
           path: artifacts/
 
-      - name: Extract version from file
-        id: get-version
-        run: |
-          VERSION=$(./gradlew -q printProjectVersion)
-          echo "VERSION=${VERSION}" >> $GITHUB_ENV
-
       - name: Release
         uses: softprops/action-gh-release@v2
         if: true

helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cp-programming-stats-bot
 version: 1.0.0
-description: A Helm chart for deploying Competitive Programming Statistics Discord Bot
+description: A Helm chart for deploying Competitive Programming Statistics Bot
 
 type: application