Less noise in MacOS artifact

COVESA · Sep 12, 2024 · 12f4ddc · 12f4ddc
1 parent 846c219
commit 12f4ddc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml
@@ -102,9 +102,9 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ success() }}
         with:
-          name: DLTViewer-${{ matrix.macos }}-${{ matrix.abi }}
-          path: build/dist/DLTViewer*.tgz
-
+          name: DLTViewer-MacOS-${{ matrix.abi }}
+          path: |
+            build/install/DLTViewer.*
 
   buildLinux:
     name: Build ${{ matrix.ubuntu }}

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build project
         run: scripts/darwin/build.sh
       - name: Archive artifact
-        run: zip DLT-macOS-${{ matrix.abi }}.zip -r build/dist
+        run: zip DLT-macOS-${{ matrix.abi }}.zip -r build/install -i 'DLTViewer*'
       - name: Upload DLT artifact
         uses: actions/upload-artifact@v4
         with:
@@ -118,12 +118,14 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: DLT-Linux
-      - name: Download DLT macOS artifacts
+      - name: Download DLT macOS artifacts arm64
         uses: actions/download-artifact@v4
         with:
-          name: |
-            DLT-Mac-x86
-            DLT-Mac-arm64
+          name: DLT-Mac-arm64
+      - name: Download DLT macOS artifacts x86
+        uses: actions/download-artifact@v4
+        with:
+          name: DLT-Mac-x86
       - name: Download DLT Windows parser artifacts
         uses: actions/download-artifact@v4
         with:

diff --git a/scripts/darwin/build.sh b/scripts/darwin/build.sh
@@ -66,6 +66,11 @@ cd "${BUILD_DIR}"
 FULL_VERSION=$(cat "${BUILD_DIR}/full_version.txt")
 echo "FULL_VERSION=${FULL_VERSION}"
 
-mkdir -p dist
-cp ../scripts/darwin/install.md dist
-tar -czvf "dist/DLTViewer-${FULL_VERSION}.tgz" -C ${INSTALL_DIR} .
+echo "Artifacts are here"
+ls ${INSTALL_DIR}
+find . -name "DLTViewer*.dmg"
+find . -name "DLTViewer.*"
+#
+#mkdir -p dist
+#cp ../scripts/darwin/install.md dist
+#tar -czvf "dist/DLTViewer-${FULL_VERSION}.tgz" -C "${INSTALL_DIR}" .