Skip to content

Commit f582786

Browse files
committed
Update additional templates
1 parent 0756042 commit f582786

2 files changed

Lines changed: 38 additions & 4 deletions

File tree

lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/internal-release-tag-failed.yml.erb

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ html_notes: |
44
Failed to tag the release with <code><%= tag %></code> tag.<br>
55
Please follow instructions below to tag the branch, make GitHub release and merge release branch to <code><%= base_branch %></code> manually.<br>
66
<br>
7-
Issue the following git commands to tag the release and merge the branch:
7+
First, disable branch protection on the apple-browsers repository:
8+
<ul>
9+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
10+
<li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
11+
<li>Scroll down to the bottom and click 'Save changes'</li>
12+
<li>Authenticate with GitHub to approve the ruleset change</li>
13+
</ul>
14+
<br>
15+
Next, issue the following git commands to tag the release and merge the branch:
816
<ul>
917
<li><code>git fetch origin</code></li>
1018
<li><code>git checkout <%= branch %></code> switch to the release branch</li>
@@ -23,7 +31,16 @@ html_notes: |
2331
</ul></li>
2432
</ul></li>
2533
<li><code>git push origin <%= base_branch %></code> push merged branch</li>
26-
</ul><br>
34+
</ul>
35+
<br>
36+
Finally, re-enable branch protection:
37+
<ul>
38+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
39+
<li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
40+
<li>Scroll down to the bottom and click 'Save changes'</li>
41+
<li>Authenticate with GitHub to approve the ruleset change</li>
42+
</ul>
43+
<br>
2744
To create GitHub release:
2845
<ul>
2946
<li>Set up GH CLI if you haven't yet: <a data-asana-gid='1203791243007683'/></li>

spec/asana_create_action_item_action_spec.rb

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
319319
Failed to tag the release with <code>1.1.0-123</code> tag.<br>
320320
Please follow instructions below to tag the branch, make GitHub release and merge release branch to <code>main</code> manually.<br>
321321
<br>
322-
Issue the following git commands to tag the release and merge the branch:
322+
First, disable branch protection on the apple-browsers repository:
323+
<ul>
324+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
325+
<li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
326+
<li>Scroll down to the bottom and click 'Save changes'</li>
327+
<li>Authenticate with GitHub to approve the ruleset change</li>
328+
</ul>
329+
<br>
330+
Next, issue the following git commands to tag the release and merge the branch:
323331
<ul>
324332
<li><code>git fetch origin</code></li>
325333
<li><code>git checkout release/1.1.0</code> switch to the release branch</li>
@@ -338,7 +346,16 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
338346
</ul></li>
339347
</ul></li>
340348
<li><code>git push origin main</code> push merged branch</li>
341-
</ul><br>
349+
</ul>
350+
<br>
351+
Finally, re-enable branch protection:
352+
<ul>
353+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
354+
<li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
355+
<li>Scroll down to the bottom and click 'Save changes'</li>
356+
<li>Authenticate with GitHub to approve the ruleset change</li>
357+
</ul>
358+
<br>
342359
To create GitHub release:
343360
<ul>
344361
<li>Set up GH CLI if you haven't yet: <a data-asana-gid='1203791243007683'/></li>

0 commit comments

Comments
 (0)