From 2e9914dce0db5f1ff359adca00abed6240c87740 Mon Sep 17 00:00:00 2001 From: Young Liu Date: Mon, 5 Jan 2026 16:56:47 +0800 Subject: [PATCH 1/2] fix(ci): fix CI build failures --- .github/workflows/ios.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 48724e1..d34e795 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -14,35 +14,23 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set Default Scheme - run: | - scheme_list=$(xcodebuild -list -json | tr -d "\n") - default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['project']['targets'][0]") - echo $default | cat >default - echo Using default scheme: $default - - name: Localization Sanity Check - run: bash scripts/check_localizations.sh - name: Build env: - scheme: ${{ 'default' }} platform: ${{ 'iOS Simulator' }} run: | device=$(xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//") - scheme_to_build=$(cat default) workspace_path="Arithmetic.xcodeproj/project.xcworkspace" - echo "Building workspace '$workspace_path' with scheme '$scheme_to_build' on device '$device'" + echo "Building workspace '$workspace_path' with scheme 'Arithmetic' on device '$device'" - xcodebuild build-for-testing -scheme "$scheme_to_build" -workspace "$workspace_path" -destination "platform=$platform,name=$device" + xcodebuild build-for-testing -scheme "Arithmetic" -workspace "$workspace_path" -destination "platform=$platform,name=$device" - name: Test env: - scheme: ${{ 'default' }} platform: ${{ 'iOS Simulator' }} run: | device=$(xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//") - scheme_to_test=$(cat default) workspace_path="Arithmetic.xcodeproj/project.xcworkspace" - echo "Testing workspace '$workspace_path' with scheme '$scheme_to_test' on device '$device'" + echo "Testing workspace '$workspace_path' with scheme 'Arithmetic' on device '$device'" - xcodebuild test-without-building -scheme "$scheme_to_test" -workspace "$workspace_path" -destination "platform=$platform,name=$device" + xcodebuild test-without-building -scheme "Arithmetic" -workspace "$workspace_path" -destination "platform=$platform,name=$device" From 458a7af581cd2caeec7eb2a23b545dcfec8329f0 Mon Sep 17 00:00:00 2001 From: Young Liu Date: Tue, 6 Jan 2026 10:45:43 +0800 Subject: [PATCH 2/2] fix i18n issue --- Views/MathBankView.swift | 2 +- Views/QrCodeToolView.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Views/MathBankView.swift b/Views/MathBankView.swift index d38964a..39ddfd9 100644 --- a/Views/MathBankView.swift +++ b/Views/MathBankView.swift @@ -90,7 +90,7 @@ struct MathBankView: View { .default(Text("math_bank.share".localized)) { showingShareSheet = true }, - .cancel(Text("button.cancel".localized)) + .cancel(Text("alert.cancel".localized)) ] ) } diff --git a/Views/QrCodeToolView.swift b/Views/QrCodeToolView.swift index e348eb9..f80d1b4 100644 --- a/Views/QrCodeToolView.swift +++ b/Views/QrCodeToolView.swift @@ -484,7 +484,7 @@ class QRCodeScannerViewController: UIViewController { // Add cancel button let cancelButton = UIButton(type: .system) - cancelButton.setTitle("button.cancel".localized, for: .normal) + cancelButton.setTitle("alert.cancel".localized, for: .normal) cancelButton.backgroundColor = UIColor.black.withAlphaComponent(0.6) cancelButton.setTitleColor(.white, for: .normal) cancelButton.layer.cornerRadius = 12