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

ci: add gitlab flow #2759

Merged
merged 1 commit into from
Jul 4, 2022
Merged

ci: add gitlab flow #2759

merged 1 commit into from
Jul 4, 2022

Conversation

SevereCloud
Copy link
Contributor

@SevereCloud SevereCloud commented Jun 28, 2022

Добавляем автоматизацию по GitLab Flow

graph LR
    A:::master ===> B((master))
    B:::master ==> C((master))
    C:::fix ==> D((master))
    D:::master ==> E((master))

    A((master)) ----> F((4.33-stable)):::first
    F --> G((4.33-stable)):::first
    C -.-> |cherry-pick| G
    D --> H((4.34-stable)):::second

    classDef master fill:#f4f0ff,stroke:#7b58cf
    classDef fix fill:#fff0f0,stroke:#cf6258
    classDef first fill:#e9f3fc,stroke:#1f75cb
    classDef second fill:#ecf4ee,stroke:#108548
Loading

Изменения

  • При создании минорной версии x.y.0 будет создана ветка x.y-stable
  • При мерже PR в мастер с лейблом patch, изменения автоматически будут добавлены в ветку x.y-stable

Требование к сопровождающему

Исправления

Стабильные (x.y-stable) ветки создаются от ветки master при публикации минорной версии(x.y.0). В стабильную ветку можно включать только исправления серьёзных багов. Следуйте правилу "upstream first": всегда, когда это возможно, сначала делайте мерж исправлений в master, и только оттуда в стабильную ветку.

Чтобы исправление автоматически попало не только в мастер но и в стабильную ветку, необходимо в PR добавить метку(label) patch. После мержа, коммиты автоматически применятся на стабильной ветке

image

Если вы забыли добавить метку или возникли конфликты(action завершился с ошибкой), необходимо создать новый PR с веткой x.y-stable используя cherry-pick. Метка patch при этом не нужна.

image

git checkout -b my-patch-branch-name x.y-stable
git cherry-pick 10903c5 ec82d64
git push
gh pr create --base x.y-stable

@SevereCloud SevereCloud requested a review from a team as a code owner June 28, 2022 09:11
@codesandbox-ci
Copy link

codesandbox-ci bot commented Jun 28, 2022

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit b7a2e97:

Sandbox Source
VKUI - default example Configuration

@github-actions
Copy link
Contributor

github-actions bot commented Jun 28, 2022

size-limit report 📦

Path Size
JS 259.02 KB (0%)
JS (gzip) 76.78 KB (0%)
JS (brotli) 64.75 KB (0%)
JS, unstable 30.06 KB (0%)
CSS 276.65 KB (0%)
CSS (gzip) 38.92 KB (0%)
CSS (brotli) 31.32 KB (0%)
CSS, unstable 942 B (0%)

@github-actions
Copy link
Contributor

👀 Styleguide deployed

See the styleguide for this PR at https://vkcom.github.io/VKUI/pull/2759/

@github-actions
Copy link
Contributor

github-actions bot commented Jun 28, 2022

Code coverage

lines3793 / 485878.07%
statements3862 / 495377.97%
functions843 / 106079.52%
branches3312 / 464371.33%
branchesTrue0 / 0100.00%

Generated by 🚫 dangerJS against b7a2e97

inomdzhon
inomdzhon previously approved these changes Jul 4, 2022
.github/gitflow/utils.js Outdated Show resolved Hide resolved
.github/gitflow/utils.js Outdated Show resolved Hide resolved
Co-authored-by: Inomdzhon Mirdzhamolov <[email protected]>
Copy link
Contributor

@inomdzhon inomdzhon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 🔥

@SevereCloud SevereCloud merged commit 8c05737 into master Jul 4, 2022
@SevereCloud SevereCloud deleted the SevereCloud/gitlab-flow branch July 4, 2022 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants