Mix solutions to comply with the package naming convention

wazuh · Jan 10, 2024 · ea5a744 · ea5a744
1 parent e60d911
commit ea5a744
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,6 +37,7 @@ jobs:
       architecture: ${{ matrix.architecture }}
       distribution: ${{ matrix.distribution }}
       revision: ${{ inputs.revision }}
+      name: wazuh-indexer-min_${{ needs.version.outputs.version }}-${{ inputs.revision }}-${{ matrix.architecture }}_${{ github.sha }}.${{ matrix.distribution }}
       # wazuh-indexer-min_4.8.0-rc1_x64_ff98475f.deb
       # TODO arm64 != amd64 (deb), x64 != x86_64 (rpm)
       # TODO use short SHA https://stackoverflow.com/a/59819441/13918537
@@ -56,4 +57,5 @@ jobs:
     with:
       architecture: ${{ matrix.architecture }}
       distribution: ${{ matrix.distribution }}
-      min: ${{ needs.build.outputs.artifact_name }}
+      min: wazuh-indexer-min_${{ needs.version.outputs.version }}-${{ inputs.revision }}-${{ matrix.architecture }}_${{ github.sha }}.${{ matrix.distribution }}
+      name: wazuh-indexer_${{ needs.version.outputs.version }}-${{ inputs.revision }}-${{ matrix.architecture }}_${{ github.sha }}.${{ matrix.distribution }}
diff --git a/.github/workflows/r_assemble.yml b/.github/workflows/r_assemble.yml
@@ -19,6 +19,10 @@ on:
         description: The name of the package to download.
         required: true
         type: string
+      name:
+        description: The name of the package to upload.
+        required: true
+        type: string
 
 jobs:
   r_assemble:
@@ -53,6 +57,6 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.get_name.outputs.name }}
+          name: ${{ inputs.name }}
           path: artifacts/dist/${{ steps.get_name.outputs.name }}
           if-no-files-found: error
diff --git a/.github/workflows/r_build.yml b/.github/workflows/r_build.yml
@@ -17,6 +17,10 @@ on:
         type: string
       revision:
         type: string
+      name:
+        description: The name of the package to upload.
+        required: true
+        type: string
     outputs:
       artifact_name:
         description: "Returns the build artifact's filename"
@@ -52,6 +56,6 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.get_name.outputs.name }}
+          name: ${{ inputs.name }}
           path: artifacts/dist/${{ steps.get_name.outputs.name }}
           if-no-files-found: error