Rename wheel file to match the required format.

aws-observability · Feb 8, 2024 · 6c272e0 · 6c272e0
1 parent eec6566
commit 6c272e0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/main_build.yml b/.github/workflows/main_build.yml
@@ -70,13 +70,13 @@ jobs:
           pkg_version=$(grep '__version__' ../aws-opentelemetry-distro/src/amazon/opentelemetry/distro/version.py | awk -F '"' '{print $2}')
           echo "ADOT_PYTHON_VERSION=$pkg_version" >> $GITHUB_OUTPUT
           shortsha="$(git rev-parse --short HEAD)"
-          echo "STAGING_WHEEL=aws_opentelemetry_distro-$pkg_version-$shortsha.whl" >> $GITHUB_OUTPUT
-          mv aws_opentelemetry_distro-$pkg_version-py3-none-any.whl aws_opentelemetry_distro-$pkg_version-$shortsha.whl
+          echo "STAGING_WHEEL=aws_opentelemetry_distro-$pkg_version-$shortsha-py3-none-any.whl" >> $GITHUB_OUTPUT
+          cp aws_opentelemetry_distro-$pkg_version-py3-none-any.whl aws_opentelemetry_distro-$pkg_version-$shortsha-py3-none-any.whl
 
       - name: Upload to GitHub Actions
         uses: actions/upload-artifact@v3
         with:
-          name: aws_opentelemetry_distro.whl
+          name: aws_opentelemetry_distro-${{ steps.staging_wheel_build.outputs.ADOT_PYTHON_VERSION}}-py3-none-any.whl
           path: dist/${{ steps.staging_wheel_build.outputs.STAGING_WHEEL}}
 
       - name: Configure AWS Credentials

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
@@ -59,13 +59,13 @@ jobs:
           pkg_version=$(grep '__version__' ../aws-opentelemetry-distro/src/amazon/opentelemetry/distro/version.py | awk -F '"' '{print $2}')
           echo "ADOT_PYTHON_VERSION=$pkg_version" >> $GITHUB_OUTPUT
           shortsha="$(git rev-parse --short HEAD)"
-          echo "STAGING_WHEEL=aws_opentelemetry_distro-$pkg_version-$shortsha.whl" >> $GITHUB_OUTPUT
-          mv aws_opentelemetry_distro-$pkg_version-py3-none-any.whl aws_opentelemetry_distro-$pkg_version-$shortsha.whl
+          echo "STAGING_WHEEL=aws_opentelemetry_distro-$pkg_version-$shortsha-py3-none-any.whl" >> $GITHUB_OUTPUT
+          cp aws_opentelemetry_distro-$pkg_version-py3-none-any.whl aws_opentelemetry_distro-$pkg_version-$shortsha-py3-none-any.whl
 
       - name: Upload to GitHub Actions
         uses: actions/upload-artifact@v3
         with:
-          name: aws_opentelemetry_distro.whl
+          name: aws_opentelemetry_distro-${{ steps.pr_wheel_build.outputs.ADOT_PYTHON_VERSION}}-py3-none-any.whl
           path: dist/${{ steps.pr_wheel_build.outputs.STAGING_WHEEL}}
 
       - name: Set up QEMU

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -94,12 +94,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         run: |
-          cp "dist/aws_opentelemetry_distro-${{ steps.wheel_build.outputs.ADOT_PYTHON_VERSION }}-py3-none-any.whl" aws_opentelemetry_distro.whl
           gh release create --target "$GITHUB_REF_NAME" \
              --title "Release v${{ github.event.inputs.version }}" \
              --draft \
              "v${{ github.event.inputs.version }}" \
-             aws_opentelemetry_distro.whl
+             dist/aws_opentelemetry_distro-${{ steps.wheel_build.outputs.ADOT_PYTHON_VERSION }}-py3-none-any.whl
 
       - name: Get PyPI secrets by name and ARN
         uses: aws-actions/aws-secretsmanager-get-secrets@v1