Merge pull request #193 from yaswanth-deriv/fix-version

[FEQ]Yaswanth/FEQ-1233/To fix version issue
binary-com · Jan 10, 2024 · 7e4615f · 7e4615f
2 parents 4692bb1 + 2dabda0
commit 7e4615f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.github/actions/send_slack_notifications/action.yml b/.github/actions/send_slack_notifications/action.yml
@@ -23,7 +23,7 @@ runs:
     run: |
         curl -X POST -H 'Content-type: application/json' \
         --data '{
-        "text": "${{ inputs.RELEASE_TYPE }} Release succeeded for dsmarttrader.deriv.com with version ${{ inputs.VERSION }}"
+        "text": "${{ inputs.RELEASE_TYPE }} Release succeeded for developers.binary.com with version ${{ inputs.VERSION }}"
         }' \
           ${{ inputs.SLACK_WEBHOOK_URL }}
     shell: bash
@@ -33,7 +33,7 @@ runs:
     run: |
           curl -X POST -H 'Content-type: application/json' \
           --data '{
-            "text": "${{ inputs.RELEASE_TYPE }} Release failed for dsmarttrader.deriv.com with version ${{ inputs.VERSION }}"
+            "text": "${{ inputs.RELEASE_TYPE }} Release failed for developers.binary.com with version ${{ inputs.VERSION }}"
           }' \
           ${{ inputs.SLACK_WEBHOOK_URL }}
     shell: bash
diff --git a/.github/actions/versioning/action.yml b/.github/actions/versioning/action.yml
@@ -4,10 +4,18 @@ inputs:
   RELEASE_TYPE:
     description: Release Type
     required: false
+outputs:
+  version:
+    description: Version
 
 runs:
   using: composite
   steps:
     - name: Tag build
       run: echo "${GITHUB_REF#refs/heads/} $(date -u +'%Y-%m-%dT%H:%M:%SZ')" > _site/version
       shell: bash
+    - name: Set Version
+      id: set_version
+      run: |
+       echo "version=${GITHUB_REF#refs/heads/} $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
+      shell: bash
diff --git a/.github/workflows/release-production.yml b/.github/workflows/release-production.yml
@@ -7,6 +7,8 @@ jobs:
   build_test_and_publish:
     name: Build, Test and Publish to Production
     runs-on: ubuntu-latest
+    outputs:
+      RELEASE_VERSION: ${{ steps.extract_version.outputs.RELEASE_VERSION }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -23,6 +25,9 @@ jobs:
         uses: ./.github/actions/versioning
         with:
           release_type: production
+      - name: Extract version
+        id: extract_version
+        run: echo "RELEASE_VERSION=${version}" >> $GITHUB_OUTPUT
       - name: Publish to Cloudflare Pages Production
         uses: "./.github/actions/publish_to_pages_production"
         with:
@@ -39,7 +44,7 @@ jobs:
           SERVICEACCOUNT_TOKEN: ${{ secrets.SERVICEACCOUNT_TOKEN }}
           CA_CRT: ${{ secrets.CA_CRT }}
           APP_VERSION: latest
-      
+
 
   send_slack_notification:
     name: Send Slack notification
@@ -57,4 +62,4 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
           status: ${{ env.WORKFLOW_CONCLUSION }}
           release_type: Production
-          version: $GITHUB_REF_NAME
+          version: ${{ needs.build_test_and_publish.outputs.RELEASE_VERSION }}