canary - #6866
Merged
Merged
Conversation
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_016NNj7B5mf9DvKu6EBga3Ty
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Essentials Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
Co-authored-by: TinyKitten <32848922+TinyKitten@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
概要
devをcanaryへ反映するリリース PR です。変更の種類
変更内容
devをrelease/v10.15.0へマージし版数ファイルの衝突をリリース版数とビルド番号最大値で解決masterをdevへ同期 (dev<-master #6865)アプリ挙動の差分はありません。今回
canaryに入るのは v10.15.0 本番リリースに伴う版数ファイルの更新のみで、機能変更分は前回のカナリア PR (#6863) の時点で既にcanaryへ反映済みです。変更ファイルは以下の 6 件で、いずれも semver を
10.14.0→10.15.0に上げるものです。app.config.tsversion: '10.15.0'package.json/package-lock.json"version": "10.15.0"android/app/build.gradleversionName "10.15.0"(dev / prod 両フレーバー)android/wearable/build.gradle.ktsversionName = "10.15.0"(dev / prod 両フレーバー)ios/TrainLCD.xcodeproj/project.pbxprojMARKETING_VERSION = 10.15.0ビルド番号は据え置きです(Android
versionCodeは app100000711/ wearable100000712のまま、iOSCURRENT_PROJECT_VERSIONも差分なし)。この PR を open した時点でbump_version_on_canary_pr.ymlが走り、カナリア用のビルド番号 bump PR が別途生成されます。テスト
devにマージ済みの内容です。devの HEAD (a54366b1) に対する CI で以下が成功していることを確認しています。npm run lintが通ることnpm testが通ることnpm run typecheckが通ることなお同コミットの
Dependabotチェックのみ failure ですが、これは依存更新側のチェックで本 PR の差分(版数ファイルのみ)とは無関係です。関連Issue
スクリーンショット(任意)
UI 変更なし: 差分は版数ファイル(
app.config.ts/package.json/package-lock.json/android/**/build.gradle*/ios/**/project.pbxproj)のみで、src/**やassets/**に変更がなく画面表示は変わりません。🤖 Generated with Claude Code
https://claude.ai/code/session_01SoKqHxHNmbKq8vLeTsVXyL