devonfw#563: adjusted assemblies

made sure that assemblies use matrix os names removed merge-multiple to extract artifacts into own folders
jan-vcapgemini · Nov 6, 2024 · f84007b · f84007b
1 parent 5b2e64b
commit f84007b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -80,9 +80,12 @@ jobs:
         with:
           pattern: natives-*
           path: ./cli/target/
-          merge-multiple: true
       - run: |
           mvn -B -ntp -Dstyle.color=always install
+      - name: Upload project
+        uses: actions/upload-artifact@v4
+        with:
+          path: ./cli/target/*.tgz
       - name: Deploy to OSSRH nexus
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

diff --git a/cli/src/main/assembly/release-linux-x64.xml b/cli/src/main/assembly/release-linux-x64.xml
@@ -11,7 +11,7 @@
       <directory>${project.build.directory}</directory>
       <outputDirectory>./bin</outputDirectory>
       <includes>
-        <include>${imageName}</include>
+        <include>natives-ubuntu-latest/${imageName}</include>
       </includes>
     </fileSet>
     <fileSet>

diff --git a/cli/src/main/assembly/release-mac-arm.xml b/cli/src/main/assembly/release-mac-arm.xml
@@ -11,7 +11,7 @@
       <directory>${project.build.directory}</directory>
       <outputDirectory>./bin</outputDirectory>
       <includes>
-        <include>${imageName}</include>
+        <include>natives-macos-latest/${imageName}</include>
       </includes>
     </fileSet>
     <fileSet>

diff --git a/cli/src/main/assembly/release-mac-x64.xml b/cli/src/main/assembly/release-mac-x64.xml
@@ -11,7 +11,7 @@
       <directory>${project.build.directory}</directory>
       <outputDirectory>./bin</outputDirectory>
       <includes>
-        <include>${imageName}</include>
+        <include>natives-macos-13/${imageName}</include>
       </includes>
     </fileSet>
     <fileSet>

diff --git a/cli/src/main/assembly/release-win-x64.xml b/cli/src/main/assembly/release-win-x64.xml
@@ -11,7 +11,7 @@
       <directory>${project.build.directory}</directory>
       <outputDirectory>./bin</outputDirectory>
       <includes>
-        <include>${imageName}.exe</include>
+        <include>natives-windows-latest/${imageName}.exe</include>
       </includes>
     </fileSet>
     <fileSet>