#528 set consistent bundle id

This commit is contained in:
neil molina 2023-05-02 12:21:17 +08:00
parent 5363ceeef4
commit 7ae1dd2ddb
2 changed files with 4 additions and 5 deletions

View file

@ -194,14 +194,14 @@ jobs:
# Notarize. Can take up to 10 minutes (and fail) asynchronously # Notarize. Can take up to 10 minutes (and fail) asynchronously
# sometimes this might fail because exact the same zip has been uploaded already # sometimes this might fail because exact the same zip has been uploaded already
- name: notarize .app arm64 - name: notarize .app arm64
run: xcrun altool --notarize-app --username "$APPLE_ID" --password "$APPLE_PASSWORD" --primary-bundle-id "com.tea.xyz" --file dist/$ZIP_FILE || true run: xcrun altool --notarize-app --username "$APPLE_ID" --password "$APPLE_PASSWORD" --primary-bundle-id "xyz.tea.gui" --file dist/$ZIP_FILE || true
env: env:
APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
ZIP_FILE: ${{ steps.app_files.outputs.zip_arm64 }} ZIP_FILE: ${{ steps.app_files.outputs.zip_arm64 }}
- name: notarize .app x86+64 - name: notarize .app x86+64
run: xcrun altool --notarize-app --username "$APPLE_ID" --password "$APPLE_PASSWORD" --primary-bundle-id "com.tea.xyz" --file dist/$ZIP_FILE || true run: xcrun altool --notarize-app --username "$APPLE_ID" --password "$APPLE_PASSWORD" --primary-bundle-id "xyz.tea.gui" --file dist/$ZIP_FILE || true
env: env:
APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}

View file

@ -4,8 +4,9 @@ const path = require("path");
const otaClient = require("@crowdin/ota-client"); const otaClient = require("@crowdin/ota-client");
const _ = require("lodash"); const _ = require("lodash");
const appBundleId = "xyz.tea.gui";
module.exports = { module.exports = {
appId: "xyz.tea.gui", appId: appBundleId,
productName: "tea", productName: "tea",
asar: false, asar: false,
directories: { output: "dist" }, directories: { output: "dist" },
@ -28,8 +29,6 @@ module.exports = {
console.log("afterSign hook triggered"); console.log("afterSign hook triggered");
const appBundleId = "xyz.tea.gui";
let appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`); let appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`);
if (!fs.existsSync(appPath)) { if (!fs.existsSync(appPath)) {
console.log("skip"); console.log("skip");