Update release-combined-layer-java.yml

Author: bardabun

.github/workflows/release-combined-layer-java.yml

@@ -30,9 +30,6 @@ jobs:
         architecture:
           - amd64
           - arm64
-        layer_type:
-          - javaagent
-          - wrapper
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
@@ -48,25 +45,19 @@ jobs:
       - name: Build Combined Layer
         run: |
           cd java
-          ARCHITECTURE=${{ matrix.architecture }} LAYER_TYPE=${{ matrix.layer_type }} ./build-combined.sh
+          ARCHITECTURE=${{ matrix.architecture }} ./build-combined.sh
         env:
           ARCHITECTURE: ${{ matrix.architecture }}
-          LAYER_TYPE: ${{ matrix.layer_type }}
-
-      - name: Rename zip file for architecture and type
-        run: |
-          mv build/otel-java-${{ matrix.layer_type }}-extension-layer.zip build/otel-java-${{ matrix.layer_type }}-extension-layer-${{ matrix.architecture }}.zip
-        working-directory: java
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         name: Save assembled combined layer to build
         with:
-          name: otel-java-${{ matrix.layer_type }}-extension-layer-${{ matrix.architecture }}.zip
-          path: java/build/otel-java-${{ matrix.layer_type }}-extension-layer-${{ matrix.architecture }}.zip
+          name: otel-java-extension-layer-${{ matrix.architecture }}.zip
+          path: java/build/otel-java-extension-layer-${{ matrix.architecture }}.zip
 
       - name: Add Binary to Release
         run: |
-          gh release upload ${{github.ref_name}} java/build/otel-java-${{ matrix.layer_type }}-extension-layer-${{ matrix.architecture }}.zip
+          gh release upload ${{github.ref_name}} java/build/otel-java-extension-layer-${{ matrix.architecture }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -81,14 +72,11 @@ jobs:
         architecture:
           - amd64
           - arm64
-        layer_type:
-          - javaagent
-          - wrapper
         aws_region:
           - us-east-1
     with:
-      artifact-name: otel-java-${{ matrix.layer_type }}-extension-layer-${{ matrix.architecture }}.zip
-      layer-name: otel-java-${{ matrix.layer_type }}-extension
+      artifact-name: otel-java-extension-layer-${{ matrix.architecture }}.zip
+      layer-name: otel-java-extension
       component-version: "combined"
       architecture: ${{ matrix.architecture }}
       runtimes: java11 java17 java21