Skip to content
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.

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

Bump version #1059

Closed
wants to merge 8 commits into from
Closed
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
21 changes: 21 additions & 0 deletions .github/workflows/automerge-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Auto-merge-test

on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
dependencies:
runs-on: ubuntu-latest

steps:

- uses: hmarr/auto-approve-action@v4

# - name: Auto-merge PRs
# env:
# PR_URL: ${{ github.event.pull_request.html_url }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# run: gh pr merge --auto --squash "$PR_URL"
12 changes: 8 additions & 4 deletions .github/workflows/test_fastlane_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Fastlane test build

permissions:
contents: 'write'
pull-requests: write

on:
workflow_dispatch:
Expand Down Expand Up @@ -31,10 +32,10 @@ jobs:
with:
xcode-version: '15.2'

- name: Download Middleware
run: make setup-middle
env:
MIDDLEWARE_TOKEN: ${{ secrets.MIDDLEWARE_TOKEN }}
# - name: Download Middleware
# run: make setup-middle
# env:
# MIDDLEWARE_TOKEN: ${{ secrets.MIDDLEWARE_TOKEN }}

# - name: Test comment
# run: bundle exec fastlane add_linear_comment from_tag:dev/0.22.0/32 to_tag:dev/0.22.0/33 comment:"Test comment \`0.23\`"
Expand All @@ -58,10 +59,13 @@ jobs:
export LANG=en_US.UTF-8
bundle exec fastlane test_build
env:
GH_TOKEN: ${{ github.token }}
MATCH_GIT_PRIVATE_KEY: ${{ secrets.SSH_KEY_FASTLANE_MATCH }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_ISSUER_ID }}
APP_STORE_CONNECT_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_PRIVATE_KEY }}
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 900
FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 4

- uses: hmarr/auto-approve-action@v4
18 changes: 9 additions & 9 deletions Anytype.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12600,7 +12600,7 @@
CODE_SIGN_ENTITLEMENTS = Anytype/Anytype.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_ASSET_PATHS = "Anytype/Resources/Preview\\ Content";
DEVELOPMENT_TEAM = J3NXTX3T5S;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -12644,7 +12644,7 @@
CODE_SIGN_ENTITLEMENTS = Anytype/Anytype.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_ASSET_PATHS = "Anytype/Resources/Preview\\ Content";
DEVELOPMENT_TEAM = J3NXTX3T5S;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -12800,7 +12800,7 @@
CODE_SIGN_ENTITLEMENTS = Anytype/Anytype.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_ASSET_PATHS = "Anytype/Resources/Preview\\ Content";
DEVELOPMENT_TEAM = J3NXTX3T5S;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -12867,7 +12867,7 @@
CODE_SIGN_ENTITLEMENTS = AnytypeShareExtension/AnytypeShareExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = J3NXTX3T5S;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -12899,7 +12899,7 @@
CODE_SIGN_ENTITLEMENTS = AnytypeShareExtension/AnytypeShareExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = J3NXTX3T5S;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -12932,7 +12932,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = J3NXTX3T5S;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -12966,7 +12966,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = J3NXTX3T5S;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -13000,7 +13000,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = J3NXTX3T5S;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -13034,7 +13034,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = J3NXTX3T5S;
GENERATE_INFOPLIST_FILE = YES;
Expand Down
46 changes: 36 additions & 10 deletions fastlane/FastfileDebugLanes
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,45 @@ platform :ios do
setup_ci
match(readonly: true)

desc "Runs all the tests"
sh("git", "checkout", "-b", "increment")

xcodeproj = ENV["APP_PROJECT"]

setup_ci
match(readonly: true)

ensure_git_status_clean(
show_uncommitted_changes: true
)

# sh("git checkout -b " + temp_branch)

build_number = increment_build_number(xcodeproj: xcodeproj, skip_info_plist: true)
version = get_version_number(xcodeproj: xcodeproj, target: ENV["APP_TARGET"])

build_app(
scheme: ENV["APP_TARGET"],
configuration: ENV["APP_CONF_DEVELOP"],
include_symbols: true,
use_system_scm: true,
archive_path: "./build/archive",
output_directory: "./build/result",
xcargs: ENV['BUILD_OPTIONS'],
cloned_source_packages_path: ENV['SPM_DERIVED_DATA']
commit_version_bump(
message: "Bump version #{version}(#{build_number})",
xcodeproj: xcodeproj,
no_verify: true
)

push_to_git_remote(no_verify: true, force: true)

sh("gh pr create --base \"ios-2555-bump-app-from-branch\" --title \"Bump version\" --body \"\"")

# desc "Runs all the tests"

# build_app(
# scheme: ENV["APP_TARGET"],
# configuration: ENV["APP_CONF_DEVELOP"],
# include_symbols: true,
# use_system_scm: true,
# archive_path: "./build/archive",
# output_directory: "./build/result",
# xcargs: ENV['BUILD_OPTIONS'],
# cloned_source_packages_path: ENV['SPM_DERIVED_DATA']
# )

end

end
Loading