fix(macos): workaround App Store Connect dSYM validation bug (#62)
* fix(macos): workaround App Store Connect dSYM validation bug for App.framework * test: mock device and package plugins and increase timeout - Increase sync loop timeout in thread workspace binding test to avoid flakiness - Mock device_info and package_info plugins for gateway runtime tests - Update pubspec.yaml version * test: fix missing plugin in runtime_controllers_settings_account_test * build: make sync-version.sh auto-increment build number --------- Co-authored-by: Haitao Pan <manbuzhe2009@qq.com>
This commit is contained in:
parent
6fb1441226
commit
08ba6e30f7
@ -2,9 +2,9 @@ name: xworkmate
|
|||||||
description: "XWorkmate desktop-first AI workspace shell."
|
description: "XWorkmate desktop-first AI workspace shell."
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
|
|
||||||
version: 1.1.5+1
|
version: 1.1.5+2
|
||||||
build-date: 2026-06-28
|
build-date: 2026-06-30
|
||||||
build-id: 4e02107
|
build-id: a876e3b
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.11.0
|
sdk: ^3.11.0
|
||||||
|
|||||||
@ -46,3 +46,11 @@ for framework_path in "${frameworks_dir}"/*.framework; do
|
|||||||
rm -rf "${dsym_path}" || true
|
rm -rf "${dsym_path}" || true
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Workaround for App Store Connect bug where it expects the DWARF file for App.framework to be named "A"
|
||||||
|
# because the binary is located at App.framework/Versions/A/App.
|
||||||
|
app_dwarf_dir="${DWARF_DSYM_FOLDER_PATH}/App.framework.dSYM/Contents/Resources/DWARF"
|
||||||
|
if [[ -d "${app_dwarf_dir}" && -f "${app_dwarf_dir}/App" && ! -f "${app_dwarf_dir}/A" ]]; then
|
||||||
|
echo "Applying workaround: Copying App DWARF file to A for App Store Connect validation"
|
||||||
|
cp "${app_dwarf_dir}/App" "${app_dwarf_dir}/A"
|
||||||
|
fi
|
||||||
|
|||||||
29
scripts/sync-version.sh
Executable file
29
scripts/sync-version.sh
Executable file
@ -0,0 +1,29 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ -n "$1" ]; then
|
||||||
|
TARGET_VERSION="$1"
|
||||||
|
else
|
||||||
|
# Extract current version from pubspec.yaml
|
||||||
|
CURRENT_VERSION=$(grep "^version: " pubspec.yaml | awk '{print $2}')
|
||||||
|
|
||||||
|
if [[ "$CURRENT_VERSION" == *"+"* ]]; then
|
||||||
|
BASE_VERSION=$(echo "$CURRENT_VERSION" | cut -d'+' -f1)
|
||||||
|
BUILD_NUM=$(echo "$CURRENT_VERSION" | cut -d'+' -f2)
|
||||||
|
NEXT_BUILD_NUM=$((BUILD_NUM + 1))
|
||||||
|
TARGET_VERSION="${BASE_VERSION}+${NEXT_BUILD_NUM}"
|
||||||
|
else
|
||||||
|
TARGET_VERSION="${CURRENT_VERSION}+1"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
DATE=$(date +%Y-%m-%d)
|
||||||
|
COMMIT=$(git rev-parse --short HEAD)
|
||||||
|
|
||||||
|
# Update version in pubspec.yaml
|
||||||
|
sed -i.bak -e "s/^version: .*/version: ${TARGET_VERSION}/" \
|
||||||
|
-e "s/^build-date: .*/build-date: ${DATE}/" \
|
||||||
|
-e "s/^build-id: .*/build-id: ${COMMIT}/" pubspec.yaml
|
||||||
|
|
||||||
|
rm -f pubspec.yaml.bak
|
||||||
|
|
||||||
|
echo "Updated pubspec.yaml to version=${TARGET_VERSION}, build-date=${DATE}, build-id=${COMMIT}"
|
||||||
41
test/mock_plugins.dart
Normal file
41
test/mock_plugins.dart
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
|
void mockPlugins() {
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel('dev.fluttercommunity.plus/package_info'),
|
||||||
|
(MethodCall methodCall) async {
|
||||||
|
return {
|
||||||
|
'appName': 'XWorkmate',
|
||||||
|
'packageName': 'com.xevor.xworkmate',
|
||||||
|
'version': '1.1.5',
|
||||||
|
'buildNumber': '1',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel('dev.fluttercommunity.plus/device_info'),
|
||||||
|
(MethodCall methodCall) async {
|
||||||
|
return {
|
||||||
|
'computerName': 'Test-Mac',
|
||||||
|
'hostName': 'Test-Mac',
|
||||||
|
'arch': 'arm64',
|
||||||
|
'model': 'MacBookPro18,1',
|
||||||
|
'kernelVersion': 'Darwin 21.4.0',
|
||||||
|
'osRelease': '21.4.0',
|
||||||
|
'activeCPUs': 10,
|
||||||
|
'memorySize': 34359738368,
|
||||||
|
'cpuFrequency': 3200000000,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel('plugins.flutter.io/path_provider'),
|
||||||
|
(MethodCall methodCall) async {
|
||||||
|
return '/tmp';
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
@ -1230,7 +1230,7 @@ void main() {
|
|||||||
);
|
);
|
||||||
for (
|
for (
|
||||||
var attempt = 0;
|
var attempt = 0;
|
||||||
attempt < 300 &&
|
attempt < 1000 &&
|
||||||
controller
|
controller
|
||||||
.requireTaskThreadForSessionInternal('unit-fixture-task-a')
|
.requireTaskThreadForSessionInternal('unit-fixture-task-a')
|
||||||
.lastArtifactSyncStatus !=
|
.lastArtifactSyncStatus !=
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
import "../mock_plugins.dart";
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
@ -11,6 +12,7 @@ import 'package:xworkmate/runtime/secure_config_store.dart';
|
|||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
TestWidgetsFlutterBinding.ensureInitialized();
|
TestWidgetsFlutterBinding.ensureInitialized();
|
||||||
|
mockPlugins();
|
||||||
HttpOverrides.global = null;
|
HttpOverrides.global = null;
|
||||||
|
|
||||||
test(
|
test(
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
import "../mock_plugins.dart";
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
@ -9,6 +10,8 @@ import 'package:xworkmate/runtime/runtime_models.dart';
|
|||||||
import 'package:xworkmate/runtime/secure_config_store.dart';
|
import 'package:xworkmate/runtime/secure_config_store.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
TestWidgetsFlutterBinding.ensureInitialized();
|
||||||
|
mockPlugins();
|
||||||
group('SettingsController account sync', () {
|
group('SettingsController account sync', () {
|
||||||
test(
|
test(
|
||||||
'prefers managed bridge token over stale profile token for remote gateway auth',
|
'prefers managed bridge token over stale profile token for remote gateway auth',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user