Skip to content

Fix: CI pipeline match branch conflict #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graycreate merged 2 commits into from
Dec 27, 2025
Merged

Fix: CI pipeline match branch conflict #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d20959
fix: add clone_branch_directly to fix match branch conflict in CI
graycreate Dec 27, 2025
3e30c81
chore: bump version to 1.2.3
graycreate Dec 27, 2025
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

All notable changes to V2er iOS app will be documented in this file.

## v1.2.3 (Build XX)
1. Fix: Resolved CI pipeline issue with certificate syncing

## v1.2.2 (Build XX)
1. Feature: Add reply sorting by popularity for better content discovery
2. Feature: Redesigned feedback section with improved vertical layout
Expand Down
2 changes: 1 addition & 1 deletion Version.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// VERSION_CODE: Build number (must always increase)

// VERSION_NAME - This is what users see (e.g., 1.1.2)
MARKETING_VERSION = 1.2.2
MARKETING_VERSION = 1.2.3

// VERSION_CODE - Internal build number (e.g., 29, 30, 31...)
CURRENT_PROJECT_VERSION = 51
3 changes: 3 additions & 0 deletions fastlane/Matchfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ git_branch("main")
# Clone certificates repo to a temporary directory
shallow_clone(true)

# Clone the branch directly to avoid "branch already exists" error in CI
clone_branch_directly(true)

# Generate profiles if they don't exist
generate_apple_certs(true)

Expand Down
Loading