Release Workflow fixes

yowidin · Sep 13, 2023 · 832fa1f · 832fa1f
1 parent 44fa1ac
commit 832fa1f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -60,8 +60,15 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: serial-plotter-macos
-          path: ${{ github.workspace }}/build/**/serial_plotter-*.zip
+          name: serial-plotter-macos-x86
+          path: ${{ github.workspace }}/build/x86_64/Release/serial_plotter-*.zip
+          if-no-files-found: error
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: serial-plotter-macos-armv8
+          path: ${{ github.workspace }}/build/armv8/Release/serial_plotter-*.zip
           if-no-files-found: error
 
       - name: Upload conan packages

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,7 +94,11 @@ target_include_directories(serial-plotter SYSTEM
 
 #################################################################################
 ### Packaging
+include(InstallRequiredSystemLibraries)
+set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CMAKE_PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 include(CPack)
+
 include(GNUInstallDirs)
 install(
     TARGETS serial-plotter