Merge branch 'main' into feat/VOL-4796

dvsa · Apr 18, 2024 · 06e7ddb · 06e7ddb
2 parents fe125f9 + d407d1a
commit 06e7ddb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -180,7 +180,7 @@ jobs:
     with:
       project: ${{ matrix.project }}
       should-upload-artefact: true
-      artefact-name: app-${{ matrix.project}}-${{ needs.get-version.outputs[matrix.project] }}
+      artefact-name: ${{ matrix.project}}
       retention-days: 1
     permissions:
       contents: read
@@ -209,7 +209,7 @@ jobs:
     with:
       project: ${{ matrix.project }}
       version: ${{ needs.get-version.outputs[matrix.project] }}
-      app-artefact-name: app-${{ matrix.project}}-${{ needs.get-version.outputs[matrix.project] }}
+      app-artefact-name: ${{ matrix.project}}
       should-upload-artefact-to-ecr: true
     permissions:
       contents: read

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -170,7 +170,7 @@ jobs:
     with:
       project: ${{ matrix.project }}
       should-upload-artefact: ${{ !!needs.orchestrator.outputs[format('should-build-{0}-docker', matrix.project)] }}
-      artefact-name: app-${{ matrix.project}}-${{ needs.get-version.outputs[matrix.project] }}
+      artefact-name: ${{ matrix.project}}
       retention-days: 1
     permissions:
       contents: read
@@ -199,7 +199,7 @@ jobs:
     with:
       project: ${{ matrix.project }}
       version: ${{ needs.get-version.outputs[matrix.project] }}
-      app-artefact-name: app-${{ matrix.project}}-${{ needs.get-version.outputs[matrix.project] }}
+      app-artefact-name: ${{ matrix.project}}
       should-upload-artefact-to-ecr: false
     permissions:
       contents: read

diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
@@ -5,6 +5,7 @@ on:
     inputs:
       ref:
         type: string
+        default: 5.3.0
         required: false
       project:
         type: string
@@ -181,11 +182,11 @@ jobs:
       - name: Install dependencies
         run: composer install --no-progress --prefer-dist --no-dev --optimize-autoloader
       - name: Archive
-        run: git archive --output=${{ inputs.artefact-name }}.tar.gz HEAD
+        run: tar -czf ${{ inputs.project }}.tar.gz *
       - name: Upload artefact
         if: ${{ inputs.should-upload-artefact }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artefact-name }}
-          path: app/${{ inputs.project }}/${{ inputs.artefact-name }}.tar.gz
+          path: app/${{ inputs.project }}/${{ inputs.project }}.tar.gz
           retention-days: ${{ inputs.retention-days }}