config macOs bundles names

glaumar · Aug 14, 2024 · f7b0684 · f7b0684
1 parent 5dbdeb9
commit f7b0684
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/macos_bundle_arm64.yml b/.github/workflows/macos_bundle_arm64.yml
@@ -26,6 +26,6 @@ jobs:
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.TOKEN }}
-        file: macOs/QRookie_arm64.dmg
-        asset_name:  QRookie_${{ github.ref }}_macOs_arm64.dmg 
+        file: macOs/QRookie_${{ github.ref }}_arm64.dmg
+        asset_name:  QRookie_${{ github.ref }}_arm64.dmg 
         tag: ${{ github.ref }}
diff --git a/.github/workflows/macos_bundle_x86_64.yml b/.github/workflows/macos_bundle_x86_64.yml
@@ -26,6 +26,6 @@ jobs:
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.TOKEN }}
-        file: macOs/QRookie_x86_64.dmg
-        asset_name: QRookie_${{ github.ref }}_macOs_x86_64.dmg
+        file: macOs/QRookie_${{ github.ref }}_x86_64.dmg
+        asset_name: QRookie_${{ github.ref }}_x86_64.dmg
         tag: ${{ github.ref }}
diff --git a/macOs/projectConfig.sh b/macOs/projectConfig.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 export ARCH=$(arch)
 export OS_TARGET="13"
+export APP_VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleVersion" Info.plist)
+
 if [[ "$ARCH" == "arm64" ]]; then
     export ARCH_NAME="arm64"
     eval "$(/opt/homebrew/bin/brew shellenv)"

diff --git a/macOs/signApp.sh b/macOs/signApp.sh
@@ -16,7 +16,7 @@ cd "${BUILD_DIR}"
 
 printf "\e[1;32mAssign all the libraries inside the app bundle\e[0m\n"
 find "$APP_PATH" -type f -name "*.dylib" -exec \
-codesign --deep --force --verify --verbose --timestamp --options runtime --sign "$DEVELOPER_ID" {} \;
+    codesign --deep --force --verify --verbose --timestamp --options runtime --sign "$DEVELOPER_ID" {} \;
 
 printf "\e[1;32mAssign .app\e[0m\n"
 codesign --deep --force --verify --verbose --timestamp --options runtime --sign "$DEVELOPER_ID" "$APP_PATH"
@@ -26,7 +26,7 @@ rm -rf "$DMG_DIR"
 mkdir -p "$DMG_DIR"
 cp -r "$APP_PATH" "$DMG_DIR/"
 
-DMG_NAME="$WORKING_DIR/${APP_NAME}_${ARCH_NAME}.dmg"
+DMG_NAME="$WORKING_DIR/${APP_NAME}_${APP_VERSION}_${ARCH_NAME}.dmg"
 hdiutil create -volname "$APP_NAME" -srcfolder "$DMG_DIR" -ov -format UDBZ "$DMG_NAME"
 rm -rf "$DMG_DIR"