Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ea48aa authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch 'master-fix-auto-merge-not-trigger-on-os' into 'master' 

auto-merge-ci: Change job names to job-<r,s,t>

See merge request e/templates!32
parents 1dd6e920 38bf8cd5

gitlab-ci/.gitlab-ci-auto-merge-main.yml

+3 −3
Original line number Diff line number Diff line
@@ -37,19 +37,19 @@ variables: 
    - git merge origin/$CI_COMMIT_REF_NAME

    - git push



r:

auto-merge-r:

  extends: .auto-merge-main

  variables:

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(r)$/

    TARGET_BRANCH: v1-r



s:

auto-merge-s:

  extends: .auto-merge-main

  variables:

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(s)$/

    TARGET_BRANCH: v1-s



t:

auto-merge-t:

  extends: .auto-merge-main

  variables:

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(t)$/

issue_templates/1-bug.md

+10 −9
Original line number Diff line number Diff line
@@ -6,27 +6,27 @@ 


## Summary



<Summarize the bug encountered briefly and precisely>

<!-- Summarize the bug encountered briefly and precisely -->



## The problem



**Steps to reproduce**



<How one can reproduce the issue>

<!-- How one can reproduce the issue -->



**What is the current behavior?**



<What actually happens>

<!-- What actually happens -->



**What is the expected correct behavior?**



<What you should see instead>

<!-- What you should see instead -->



## Technical informations



**Relevant logs (`adb logcat`)**



<Paste any relevant logs in the codeblock below>

<!-- Paste any relevant logs in the codeblock below -->



```
@@ -34,17 +34,18 @@ 


**Relevant screenshots**



<Screenshots of the problem>

<!-- Screenshots of the problem -->



## Solutions



**Workaround**



<To get the feature working or at least to make the device usable>

<!-- To get the feature working or at least to make the device usable -->



**Possible fixes**



<Any idea to fix the issue or a link to the line of code that might be the cause for this problem>

<!-- Any idea to fix the issue or a link to the line of code that might be the cause for this problem -->



/label ~"type::Bug"

<Add the labels corresponding to your issue by adding a tilde and typing the name of the label you think apply to your issue in the line above. You need to type a tilde before the name of each label you want to apply to the issue.>
 


<!-- Add the labels corresponding to your issue by adding a tilde and typing the name of the label you think apply to your issue in the line above. You need to type a tilde before the name of each label you want to apply to the issue. -->
 
 No newline at end of file

issue_templates/2-improvement.md

+9 −8
Original line number Diff line number Diff line
@@ -3,33 +3,34 @@ 


## Summary



<Summarize the improvement briefly and precisely>

<!-- Summarize the improvement briefly and precisely -->



## Description



**What is the current behavior?**



<What actually happens>

<!-- What actually happens -->



**What is the improved behavior?**



<What you should see instead>

<!-- What you should see instead -->



**What does it bring?**



<Why this improvement is needed>

<!-- Why this improvement is needed -->



## Mock-ups



<Provide a mock-up of how it would look with the improvement>

<!-- Provide a mock-up of how it would look with the improvement -->



## Examples



<Give the example of what users will be able to accomplish with the improvement>

<!-- Give the example of what users will be able to accomplish with the improvement -->



## Validation



<List test case that will be run to validate that the issue is working as expected>

<!-- List test case that will be run to validate that the issue is working as expected -->



/label ~"type::Improvement"

<Add the labels corresponding to your issue by adding a tilde and typing the name of the label you think apply to your issue in the line above. You need to type a tilde before the name of each label you want to apply to the issue.>
 


<!-- Add the labels corresponding to your issue by adding a tilde and typing the name of the label you think apply to your issue in the line above. You need to type a tilde before the name of each label you want to apply to the issue. -->

issue_templates/3-feature-proposal.md

+4 −3
Original line number Diff line number Diff line 
## Summary



<Summarize the feature briefly and precisely>

<!-- Summarize the feature briefly and precisely -->



## Description
@@ -22,7 +22,8 @@ 


## Validation



<List test case that will be run to validate that the issue is working as expected>

<!--List test case that will be run to validate that the issue is working as expected -->



/label ~"type::Feature Proposal"

<Add the labels corresponding to your issue by adding a tilde and typing the name of the label you think apply to your issue in the line above. You need to type a tilde before the name of each label you want to apply to the issue.>
 


<!--Add the labels corresponding to your issue by adding a tilde and typing the name of the label you think apply to your issue in the line above. You need to type a tilde before the name of each label you want to apply to the issue. -->

issue_templates/epic.md

+2 −2
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 


**Why these users would like to use this feature?**



<Define start and due date>

<!-- Define start and due date -->



/label ~

<Assign label: priority, scope, type>

<!-- Assign following label: stage, scope, type -->



## Definition of Ready (DoR)