diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/internal-release-tag-failed.yml.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/internal-release-tag-failed.yml.erb index 6650220a..96f63ce1 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/internal-release-tag-failed.yml.erb +++ b/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/internal-release-tag-failed.yml.erb @@ -4,7 +4,15 @@ html_notes: | Failed to tag the release with <%= tag %> tag.
Please follow instructions below to tag the branch, make GitHub release and merge release branch to <%= base_branch %> manually.

- Issue the following git commands to tag the release and merge the branch: + First, disable branch protection on the apple-browsers repository: + +
+ Next, issue the following git commands to tag the release and merge the branch:
  • git push origin <%= base_branch %> push merged branch
  • -
    + +
    + Finally, re-enable branch protection: + +
    To create GitHub release: +
    + Finally, re-enable branch protection: + +
    Complete this task when ready and proceed with testing the build.

    🔗 Workflow URL: <%= workflow_url %>. diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/public-release-merge-failed-untagged-commits.yml.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/public-release-merge-failed-untagged-commits.yml.erb index 06367ac1..aa1e6069 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/public-release-merge-failed-untagged-commits.yml.erb +++ b/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/public-release-merge-failed-untagged-commits.yml.erb @@ -4,7 +4,15 @@ html_notes: | You've requested proceeding with public release despite untagged commits on the <%= branch %> branch, <%= '' %> but merging to <%= base_branch %> failed. Please resolve conflicts and merge <%= branch %> to <%= base_branch %> manually.

    - Issue the following git commands: + First, disable branch protection on the apple-browsers repository: + +
    + Next, issue the following git commands:
  • git push origin <%= base_branch %> push merged branch
  • +
    + Finally, re-enable branch protection: + +
    Complete this task when done with merging, and re-run the public release workflow, still setting Ignore unreleased changes when making a public release? option to true.

    🔗 Workflow URL: <%= workflow_url %>. diff --git a/lib/fastlane/plugin/ddg_apple_automation/version.rb b/lib/fastlane/plugin/ddg_apple_automation/version.rb index 4c2bc0a4..f8ce9b43 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/version.rb +++ b/lib/fastlane/plugin/ddg_apple_automation/version.rb @@ -1,5 +1,5 @@ module Fastlane module DdgAppleAutomation - VERSION = "3.1.3" + VERSION = "3.1.4" end end diff --git a/spec/asana_create_action_item_action_spec.rb b/spec/asana_create_action_item_action_spec.rb index 8f30f868..513f4882 100644 --- a/spec/asana_create_action_item_action_spec.rb +++ b/spec/asana_create_action_item_action_spec.rb @@ -319,7 +319,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule Failed to tag the release with 1.1.0-123 tag.
    Please follow instructions below to tag the branch, make GitHub release and merge release branch to main manually.

    - Issue the following git commands to tag the release and merge the branch: + First, disable branch protection on the apple-browsers repository: + +
    + Next, issue the following git commands to tag the release and merge the branch:
  • git push origin main push merged branch
  • -
    + +
    + Finally, re-enable branch protection: + +
    To create GitHub release: +
    + Finally, re-enable branch protection: + +
    Complete this task when ready and proceed with testing the build.

    🔗 Workflow URL: https://workflow.com. @@ -645,7 +679,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule You've requested proceeding with public release despite untagged commits on the release/1.0.0 branch,#{' '} but merging to main failed. Please resolve conflicts and merge release/1.0.0 to main manually.

    - Issue the following git commands: + First, disable branch protection on the apple-browsers repository: + +
    + Next, issue the following git commands:
  • git push origin main push merged branch
  • +
    + Finally, re-enable branch protection: + +
    Complete this task when done with merging, and re-run the public release workflow, still setting Ignore unreleased changes when making a public release? option to true.

    🔗 Workflow URL: https://workflow.com.