Compare commits
12 Commits
31cc9e5a1e
...
ci/xcode-n
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d9a89e637 | |||
| 97b61d3afb | |||
| a9eda61967 | |||
| a382ad62dc | |||
| 069b7d417f | |||
| 63fbae3698 | |||
| 4b7548501a | |||
| 5079de0fb1 | |||
| 52346fb4ac | |||
| abf926e4bc | |||
| 7c50282284 | |||
| 6cc25300d1 |
@@ -1,8 +1,8 @@
|
||||
# =============================================================================
|
||||
# TabataGo — PR → Build → Archive → Firebase OTA → Wait LGTM → Merge
|
||||
# TabataGo — PR → Build → WiFi/USB Direct Deploy → Wait LGTM → Merge
|
||||
# =============================================================================
|
||||
|
||||
name: PR → Build → Firebase OTA → LGTM
|
||||
name: PR → Build → WiFi/USB Deploy → LGTM
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
@@ -16,14 +16,14 @@ permissions:
|
||||
jobs:
|
||||
|
||||
build-deploy:
|
||||
name: Build & Deploy to Firebase OTA
|
||||
name: Build & Deploy to iPhone (WiFi/USB)
|
||||
runs-on: macos
|
||||
timeout-minutes: 20
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
run: |
|
||||
git clone --depth 1 https://x-access-token:${PR_TOKEN}@gitea.1000co.fr/${REPO}.git .
|
||||
git clone --depth 1 -b ${{ github.head_ref }} https://x-access-token:${PR_TOKEN}@gitea.1000co.fr/${{ github.repository }}.git .
|
||||
env:
|
||||
PR_TOKEN: ${{ secrets.PR_API_TOKEN }}
|
||||
REPO: ${{ github.repository }}
|
||||
@@ -35,18 +35,41 @@ jobs:
|
||||
- name: Setup PATH
|
||||
run: echo "/opt/homebrew/bin" >> $GITHUB_PATH
|
||||
|
||||
- name: Clean act runner caches
|
||||
- name: Clean build artifacts
|
||||
run: |
|
||||
rm -rf ~/.cache/act/*/hostexecutor/tabatago-swift/build
|
||||
rm -rf .build
|
||||
rm -rf ~/Library/Caches/org.swift.swiftpm
|
||||
rm -rf ~/Library/Developer/Xcode/DerivedData/TabataGo-*
|
||||
rm -rf tabatago-swift/TabataGo.xcodeproj
|
||||
echo "🧹 Cleaning build artifacts..."
|
||||
|
||||
- name: Install tools (xcodegen, node, firebase)
|
||||
# Act runner caches
|
||||
rm -rf ~/.cache/act/*/hostexecutor/tabatago-swift/build 2>/dev/null || true
|
||||
|
||||
# SPM caches are KEPT between runs — RevenueCat is 1.10 GiB and takes
|
||||
# 5+ minutes to clone; re-cloning on every CI run would waste time
|
||||
# and cause random failures on the act_runner sandbox.
|
||||
|
||||
# Xcode DerivedData — suppression COMPLÈTE (le bundle ID a changé,
|
||||
# l'ancien dossier TabataGo-* peut être ignoré par le nouveau build)
|
||||
rm -rf ~/Library/Developer/Xcode/DerivedData/*
|
||||
|
||||
# Module cache Xcode — des .pcm stale peuvent segfault le linker
|
||||
rm -rf ~/Library/Developer/Xcode/DerivedData/ModuleCache.noindex 2>/dev/null || true
|
||||
rm -rf ~/Library/Caches/com.apple.dt.Xcode
|
||||
|
||||
# Build artifacts locaux (utilisés par le step "Build app")
|
||||
rm -rf build/
|
||||
rm -rf .build
|
||||
rm -rf tabatago-swift/.build
|
||||
rm -rf tabatago-swift/TabataGo.xcodeproj
|
||||
rm -rf tabatago-swift/*.xcworkspace 2>/dev/null || true
|
||||
|
||||
# Package.resolved — peut être stale après un changement de bundle ID
|
||||
find . -name "Package.resolved" -delete 2>/dev/null || true
|
||||
find . -name ".package.resolved" -delete 2>/dev/null || true
|
||||
|
||||
echo "✅ Caches nettoyés"
|
||||
|
||||
- name: Install tools (xcodegen, node, ios-deploy)
|
||||
run: |
|
||||
brew install xcodegen node || true
|
||||
npm install -g firebase-tools
|
||||
brew install xcodegen node ios-deploy || true
|
||||
|
||||
- name: Generate Xcode project
|
||||
run: |
|
||||
@@ -56,12 +79,13 @@ jobs:
|
||||
- name: Resolve SPM packages
|
||||
run: |
|
||||
cd tabatago-swift
|
||||
xcodebuild -resolvePackageDependencies -project TabataGo.xcodeproj -scmProvider system
|
||||
xcodebuild -resolvePackageDependencies \
|
||||
-project TabataGo.xcodeproj \
|
||||
-scmProvider system
|
||||
|
||||
- name: Build app
|
||||
run: |
|
||||
cd tabatago-swift
|
||||
xcodebuild -list
|
||||
xcodebuild build \
|
||||
-project TabataGo.xcodeproj \
|
||||
-scheme TabataGo \
|
||||
@@ -72,28 +96,32 @@ jobs:
|
||||
-clonedSourcePackagesDirPath ../build/spm-cache \
|
||||
SWIFT_ENABLE_EXPLICIT_MODULES=NO \
|
||||
ONLY_ACTIVE_ARCH=NO \
|
||||
CODE_SIGN_STYLE=Automatic DEVELOPMENT_TEAM=2MJF39L8VY
|
||||
CODE_SIGN_STYLE=Automatic \
|
||||
DEVELOPMENT_TEAM=2MJF39L8VY
|
||||
|
||||
- name: Package IPA
|
||||
- name: Install to iPhone (WiFi → USB fallback)
|
||||
run: |
|
||||
cd tabatago-swift
|
||||
mkdir -p Payload build
|
||||
APP=$(find ../build/derived -name 'TabataGo.app' -type d | head -1)
|
||||
cp -R "$APP" Payload/
|
||||
zip -r build/TabataGo.ipa Payload/
|
||||
rm -rf Payload
|
||||
UDID="00008120-000925CE3672201E"
|
||||
APP=$(find build/derived -name 'TabataGo.app' -type d | head -1)
|
||||
|
||||
- name: Deploy to Firebase
|
||||
env:
|
||||
FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
|
||||
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
|
||||
run: |
|
||||
npx firebase appdistribution:distribute tabatago-swift/build/TabataGo.ipa \
|
||||
--app "${FIREBASE_APP_ID}" \
|
||||
--groups "millian-test" \
|
||||
--project tabatago-19a80 \
|
||||
--token "${FIREBASE_TOKEN}" \
|
||||
--release-notes "PR: ${{ github.event.pull_request.title }}"
|
||||
# 1. Try WiFi first (Xcode 15+ devicectl network discovery)
|
||||
echo "📱 Trying WiFi install via devicectl..."
|
||||
xcrun devicectl device install app --device "$UDID" "$APP" 2>&1 | tail -3
|
||||
if [ ${PIPESTATUS[0]} -eq 0 ]; then
|
||||
echo "✅ Installed via WiFi"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# 2. Fallback to USB via ios-deploy
|
||||
echo "🔌 WiFi failed, trying USB..."
|
||||
ios-deploy --bundle "$APP" --id "$UDID" --justlaunch
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "✅ Installed via USB"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "❌ Install failed (both WiFi and USB)"
|
||||
exit 1
|
||||
|
||||
- name: Post "Ready to test" comment
|
||||
env:
|
||||
@@ -105,7 +133,7 @@ jobs:
|
||||
curl -s -X POST \
|
||||
-H "Authorization: token ${GT_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"body\":\"## 📱 Prêt à tester !\\n\\nL\'app est déployée via Firebase.\\n\\n- Teste les changements\\n- Reply **LGTM** pour merger\\n- Reply **KO** pour bloquer\"}" \
|
||||
-d "{\"body\":\"## 📱 Prêt à tester !\\n\\nL'app est déployée sur l'iPhone (USB/WiFi).\\n\\n- Teste les changements\\n- Reply **LGTM** pour merger\\n- Reply **KO** pour bloquer\"}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/issues/${PR}/comments"
|
||||
|
||||
wait-approval:
|
||||
|
||||
@@ -44,7 +44,7 @@ Or run manually:
|
||||
2. Archives the app with Xcode auto-signing
|
||||
3. Exports an App Store IPA
|
||||
4. Uploads to App Store Connect
|
||||
5. The first upload **automatically creates** the app record in App Store Connect (bundle ID: `com.tabatago.app`)
|
||||
5. The first upload **automatically creates** the app record in App Store Connect (bundle ID: `fr.millianlmx.tabatago`)
|
||||
|
||||
## After Upload
|
||||
|
||||
@@ -60,7 +60,7 @@ Or run manually:
|
||||
| Symptom | Likely Cause |
|
||||
|---|---|
|
||||
| "No accounts with iTunes Connect access" | API key doesn't have App Manager permissions — recreate the key with correct access |
|
||||
| "No profiles found" | The bundle ID `com.tabatago.app` isn't registered yet — check Apple Developer portal |
|
||||
| "No profiles found" | The bundle ID `fr.millianlmx.tabatago` isn't registered yet — check Apple Developer portal |
|
||||
| "Duplicate build number" | Build number already used — bump `CFBundleVersion` in `project.yml` and re-tag |
|
||||
| "Authentication failed" | API key was revoked, expired, or secret is misspelled — verify secrets in repository settings |
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ struct TabataEntry: TimelineEntry {
|
||||
|
||||
struct TabataProvider: TimelineProvider {
|
||||
|
||||
private let sharedDefaults = UserDefaults(suiteName: "group.com.tabatago.app")
|
||||
private let sharedDefaults = UserDefaults(suiteName: "group.fr.millianlmx.tabatago")
|
||||
|
||||
func placeholder(in context: Context) -> TabataEntry {
|
||||
TabataEntry(date: Date(), streak: 7, lastWorkoutLabel: "Today")
|
||||
@@ -127,13 +127,11 @@ struct TabataGoComplication: Widget {
|
||||
}
|
||||
.configurationDisplayName("TabataGo")
|
||||
.description(String(localized: LocalizedStringResource("watch.complication.description")))
|
||||
.supportedFamilies([
|
||||
.accessoryCircular,
|
||||
.accessoryRectangular,
|
||||
#if canImport(WatchKit)
|
||||
.accessoryCorner
|
||||
.supportedFamilies([.accessoryCircular, .accessoryRectangular, .accessoryCorner])
|
||||
#else
|
||||
.supportedFamilies([.accessoryCircular, .accessoryRectangular])
|
||||
#endif
|
||||
])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,6 @@
|
||||
<key>WKApplication</key>
|
||||
<true/>
|
||||
<key>WKCompanionAppBundleIdentifier</key>
|
||||
<string>com.tabatago.app</string>
|
||||
<string>fr.millianlmx.tabatago</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<true/>
|
||||
<key>com.apple.security.application-groups</key>
|
||||
<array>
|
||||
<string>group.com.tabatago.app</string>
|
||||
<string>group.fr.millianlmx.tabatago</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -13,7 +13,7 @@ struct WatchActivityView: View {
|
||||
@State private var isLoading = true
|
||||
|
||||
private let healthStore = HKHealthStore()
|
||||
private let sharedDefaults = UserDefaults(suiteName: "group.com.tabatago.app")
|
||||
private let sharedDefaults = UserDefaults(suiteName: "group.fr.millianlmx.tabatago")
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
name: TabataGo
|
||||
|
||||
options:
|
||||
bundleIdPrefix: com.tabatago
|
||||
bundleIdPrefix: fr.millianlmx.tabatago
|
||||
deploymentTarget:
|
||||
iOS: "26.0"
|
||||
watchOS: "11.0"
|
||||
@@ -67,7 +67,7 @@ targets:
|
||||
com.apple.developer.healthkit.access:
|
||||
- health-records
|
||||
com.apple.security.application-groups:
|
||||
- group.com.tabatago.app
|
||||
- group.fr.millianlmx.tabatago
|
||||
dependencies:
|
||||
- package: Supabase
|
||||
product: Supabase
|
||||
@@ -78,7 +78,7 @@ targets:
|
||||
embed: true
|
||||
settings:
|
||||
base:
|
||||
PRODUCT_BUNDLE_IDENTIFIER: com.tabatago.app
|
||||
PRODUCT_BUNDLE_IDENTIFIER: fr.millianlmx.tabatago
|
||||
INFOPLIST_FILE: TabataGo/Resources/Info.plist
|
||||
CODE_SIGN_ENTITLEMENTS: TabataGo/Resources/TabataGo.entitlements
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
|
||||
@@ -112,7 +112,7 @@ targets:
|
||||
CFBundleShortVersionString: "1.0"
|
||||
CFBundleVersion: "2"
|
||||
WKApplication: true
|
||||
WKCompanionAppBundleIdentifier: com.tabatago.app
|
||||
WKCompanionAppBundleIdentifier: fr.millianlmx.tabatago
|
||||
NSHealthShareUsageDescription: "TabataGo reads your heart rate and calories during workouts."
|
||||
NSHealthUpdateUsageDescription: "TabataGo saves workout data to Apple Health directly from your Watch."
|
||||
entitlements:
|
||||
@@ -120,13 +120,13 @@ targets:
|
||||
properties:
|
||||
com.apple.developer.healthkit: true
|
||||
com.apple.security.application-groups:
|
||||
- group.com.tabatago.app
|
||||
- group.fr.millianlmx.tabatago
|
||||
dependencies:
|
||||
- target: TabataGoWatchWidget
|
||||
embed: true
|
||||
settings:
|
||||
base:
|
||||
PRODUCT_BUNDLE_IDENTIFIER: com.tabatago.app.watchkitapp
|
||||
PRODUCT_BUNDLE_IDENTIFIER: fr.millianlmx.tabatago.watchkitapp
|
||||
INFOPLIST_FILE: TabataGoWatch/Resources/Info.plist
|
||||
CODE_SIGN_ENTITLEMENTS: TabataGoWatch/Resources/TabataGoWatch.entitlements
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
|
||||
@@ -152,7 +152,7 @@ targets:
|
||||
NSExtensionPointIdentifier: com.apple.widgetkit-extension
|
||||
settings:
|
||||
base:
|
||||
PRODUCT_BUNDLE_IDENTIFIER: com.tabatago.app.watchkitapp.widget
|
||||
PRODUCT_BUNDLE_IDENTIFIER: fr.millianlmx.tabatago.watchkitapp.widget
|
||||
TARGETED_DEVICE_FAMILY: "4"
|
||||
WATCHOS_DEPLOYMENT_TARGET: "11.0"
|
||||
|
||||
@@ -166,7 +166,7 @@ targets:
|
||||
- target: TabataGo
|
||||
settings:
|
||||
base:
|
||||
PRODUCT_BUNDLE_IDENTIFIER: com.tabatago.app.tests
|
||||
PRODUCT_BUNDLE_IDENTIFIER: fr.millianlmx.tabatago.tests
|
||||
|
||||
TabataGoUITests:
|
||||
type: bundle.ui-testing
|
||||
@@ -178,7 +178,7 @@ targets:
|
||||
- target: TabataGo
|
||||
settings:
|
||||
base:
|
||||
PRODUCT_BUNDLE_IDENTIFIER: com.tabatago.app.uitests
|
||||
PRODUCT_BUNDLE_IDENTIFIER: fr.millianlmx.tabatago.uitests
|
||||
|
||||
schemes:
|
||||
TabataGo:
|
||||
|
||||
Reference in New Issue
Block a user