fix(ci): use correct artifact path (#1716)

* fix(ci): use correct artifact path Signed-off-by: Justin Kolberg <[email protected]> * fix(ci): fetch non-fips artifacts too Signed-off-by: Justin Kolberg <[email protected]> --------- Signed-off-by: Justin Kolberg <[email protected]>
SumoLogic · Dec 11, 2024 · 0c5261b · 0c5261b
1 parent 7b1d067
commit 0c5261b
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -1,4 +1,4 @@
-name: 'Publish release'
+name: "Publish release"
 
 run-name: >
   ${{ format('Publish Release for Workflow: {0}', inputs.workflow_id) }}
@@ -112,22 +112,30 @@ jobs:
       - name: Download platform otelcol-sumo artifacts from workflow
         uses: actions/download-artifact@v4
         with:
-          pattern: otelcol-sumo-*-${{ matrix.arch_os }}
+          pattern: otelcol-sumo-${{ matrix.arch_os }}
+          path: artifacts/
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ inputs.workflow_id }}
+
+      - name: Download platform fips otelcol-sumo artifacts from workflow
+        uses: actions/download-artifact@v4
+        with:
+          pattern: otelcol-sumo-fips-${{ matrix.arch_os }}
           path: artifacts/
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ inputs.workflow_id }}
 
       - name: Build and push FIPS image to Open Source ECR
         run: |
-          cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
+          cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
           make build-push-container-multiplatform \
             BUILD_TAG=${{ needs.get-version.outputs.version }} \
             PLATFORM=${{ matrix.arch_os }} \
             BUILD_TYPE_SUFFIX="-fips"
 
       - name: Build and push FIPS image to DockerHub
         run: |
-          cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
+          cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
           make build-push-container-multiplatform \
             BUILD_TAG=${{ needs.get-version.outputs.version }} \
             PLATFORM=${{ matrix.arch_os }} \
@@ -136,15 +144,15 @@ jobs:
 
       - name: Build and push UBI-based FIPS image to Open Source ECR
         run: |
-          cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
+          cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
           make build-push-container-ubi \
             BUILD_TAG=${{ needs.get-version.outputs.version }} \
             PLATFORM=${{ matrix.arch_os }} \
             BUILD_TYPE_SUFFIX="-ubi-fips"
 
       - name: Build and push UBI-based FIPS image to DockerHub
         run: |
-          cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
+          cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
           make build-push-container-ubi \
             BUILD_TAG=${{ needs.get-version.outputs.version }} \
             PLATFORM=${{ matrix.arch_os }} \
@@ -153,30 +161,30 @@ jobs:
 
       - name: Build and push image to Open Source ECR
         run: |
-          cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
+          cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
           make build-push-container-multiplatform \
             BUILD_TAG=${{ needs.get-version.outputs.version }} \
             PLATFORM=${{ matrix.arch_os }}
 
       - name: Build and push image to DockerHub
         run: |
-          cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
+          cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
           make build-push-container-multiplatform \
             BUILD_TAG=${{ needs.get-version.outputs.version }} \
             PLATFORM=${{ matrix.arch_os }} \
             REPO_URL=sumologic/sumologic-otel-collector
 
       - name: Build and push UBI-based image to Open Source ECR
         run: |
-          cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
+          cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
           make build-push-container-ubi \
             BUILD_TAG=${{ needs.get-version.outputs.version }} \
             PLATFORM=${{ matrix.arch_os }} \
             BUILD_TYPE_SUFFIX="-ubi"
 
       - name: Build and push UBI-based image to DockerHub
         run: |
-          cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
+          cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
           make build-push-container-ubi \
             BUILD_TAG=${{ needs.get-version.outputs.version }} \
             PLATFORM=${{ matrix.arch_os }} \