Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion Views/MathBankView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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))
]
)
}
Expand Down
2 changes: 1 addition & 1 deletion Views/QrCodeToolView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading