create bundle names with desired processor strings (#1186)

Author: scareything

.github/workflows/release.yml

@@ -39,30 +39,6 @@ jobs:
           files: |
             ${{ runner.workspace }}/downloads/**/*.zip
 
-      # These final two steps are only necessary because we prefer a different
-      # release artifact name than is created by CMake, and so we could change
-      # the CMake configuration or add an inline (shell) run step to manipulate
-      # the filenames. The pre-release build doesn't rename the artifacts.
-      - name: Upload Linux ARM64 With a Different Name
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ${{ runner.workspace }}/downloads/linux-arm64/ziti-edge-tunnel-Linux_aarch64.zip
-          asset_name: ziti-edge-tunnel-Linux_arm64.zip
-          asset_content_type: application/octet-stream
-
-      - name: Upload Windows With a Different Name
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: ${{ runner.workspace }}/downloads/windows-x64-mingw/ziti-edge-tunnel-Windows_AMD64.zip
-          asset_name: ziti-edge-tunnel-Windows_x86_64.zip
-          asset_content_type: application/octet-stream
-
       - name: Get the Version String from Git Tag
         id: get_version
         run: |

CMakeLists.txt

@@ -142,14 +142,23 @@ if (TLSUV_TLSLIB AND NOT TLSUV_TLSLIB STREQUAL "openssl")
     set(comp-flavor "-${TLSUV_TLSLIB}")
     message(NOTICE "binary marker: ${comp-flavor}")
 endif ()
+
+if(CMAKE_SYSTEM_PROCESSOR} STREQUAL AMD64)
+    set(bundle_processor "x86_64")
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+    set(bundle_processor "arm64")
+else()
+    set(bundle_processor ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
 macro(BUNDLE_COMP comp)
     add_custom_target(${comp}-bundle
-        BYPRODUCTS ${CMAKE_BINARY_DIR}/bundle/${comp}${comp-flavor}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}.zip
+        BYPRODUCTS ${CMAKE_BINARY_DIR}/bundle/${comp}-${CMAKE_SYSTEM_NAME}_${bundle_processor}${comp-flavor}.zip
         DEPENDS ${comp}
         # use generator expression to set working directory to the target's build directory. this works for multi-config generators, e.g. when "--config" is specified at build time.
         WORKING_DIRECTORY "$<TARGET_FILE_DIR:${comp}>"
-        COMMENT "adding components to bundle ${comp} for ${CMAKE_SYSTEM_NAME}:${CMAKE_SYSTEM_PROCESSOR}: $<TARGET_FILE_NAME:${comp}> ${${comp}_BUNDLE_COMPS}"
-        COMMAND ${CMAKE_COMMAND} -E tar "cf" "${CMAKE_BINARY_DIR}/bundle/${comp}${comp-flavor}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}.zip" --format=zip -- $<TARGET_FILE_NAME:${comp}> ${${comp}_BUNDLE_COMPS})
+        COMMENT "adding components to bundle ${comp} for ${CMAKE_SYSTEM_NAME}:${bundle_processor}: $<TARGET_FILE_NAME:${comp}> ${${comp}_BUNDLE_COMPS}"
+        COMMAND ${CMAKE_COMMAND} -E tar "cf" "${CMAKE_BINARY_DIR}/bundle/${comp}-${CMAKE_SYSTEM_NAME}_${bundle_processor}${comp-flavor}.zip" --format=zip -- $<TARGET_FILE_NAME:${comp}> ${${comp}_BUNDLE_COMPS})
     add_dependencies(bundle ${comp}-bundle)
 endmacro()