From b954700562443b2b07f4583ba647ea557f8659c3 Mon Sep 17 00:00:00 2001
From: aparnajyothi-y <147696841+aparnajyothi-y@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:44:04 +0530
Subject: [PATCH] Update build-tool-packages.yml

---
 .github/workflows/build-tool-packages.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-tool-packages.yml b/.github/workflows/build-tool-packages.yml
index d250524..ee21eb9 100644
--- a/.github/workflows/build-tool-packages.yml
+++ b/.github/workflows/build-tool-packages.yml
@@ -108,17 +108,20 @@ jobs:
     needs: build
     runs-on: ${{ matrix.os }}
     env: 
-      ARTIFACT_NAME: ${{ inputs.tool-name }}-${{ inputs.tool-version }}-${{ matrix.platform }}-x64
+      ARTIFACT_NAME: ${{ inputs.tool-name }}-${{ inputs.tool-version }}-${{ matrix.platform }}-${{ matrix.arch }}
     strategy:
       fail-fast: false
       matrix:
         include:
         - os: ubuntu-latest
           platform: linux
+          arch: x64
         - os: macos-latest
           platform: darwin
+          arch: arm64
         - os: windows-latest
           platform: win32
+          arch: x64
     steps:
     - uses: actions/checkout@v3
       with:
@@ -127,24 +130,10 @@ jobs:
     - name: Fully cleanup the toolcache directory before testing
       run: ./helpers/clean-toolcache.ps1 -ToolName "${{ inputs.tool-name }}"
 
-       
-    - name: Get architecture
-      id: get-arch
-      shell: bash
-      run: |
-        if [[ "${{ matrix.platform }}" == "darwin" ]]; then
-          echo "ARCH=$(uname -m)" >> $GITHUB_ENV
-        else
-          echo "ARCH=x64" >> $GITHUB_ENV
-        fi
-
-    - name: Set env
-      run: echo "ARTIFACT_NAME=${{ inputs.tool-name }}-${{ inputs.tool-version }}-${{ matrix.platform }}-$ARCH" >> $GITHUB_ENV
-
-
     - name: Download artifact
       uses: actions/download-artifact@v3
       with:
+        name: ${{ env.ARTIFACT_NAME }}
         path: ${{ runner.temp }}
 
     - name: Extract files