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.

Sign up for GitHub

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

Jump to bottom

ci: automerge the changes from the main to the feature branch using squash commit [skip ci] #1198

Merged
merged 9 commits into from
Jun 19, 2024
Merged

ci: automerge the changes from the main to the feature branch using squash commit [skip ci] #1198

merged 9 commits into from
Jun 19, 2024

Conversation

yshyn-iohk
Copy link
Member

@yshyn-iohk yshyn-iohk commented Jun 18, 2024 •
edited
Loading

Description:

  • allow the engineer to configure the PR to be automatically updated by the GitHub action

Checklist:

  • My PR follows the contribution guidelines of this project
  • My PR is free of third-party dependencies that don't comply with the Allowlist
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked the PR title to follow the conventional commit specification

@yshyn-iohk
ci: fix auto-merge.yml file
481bc96 
Signed-off-by: Yurii Shynbuiev <yurii.shynbuiev@iohk.io>
@yshyn-iohk
ci: fix style
80532c4 
Signed-off-by: Yurii Shynbuiev <yurii.shynbuiev@iohk.io>
@yshyn-iohk
Merge remote-tracking branch 'origin/main' into ci/fix-auto-merge
4d6b86f
@yshyn-iohk
ci: use --squash to merge the changes from the main branch
1a5d188 
Signed-off-by: Yurii Shynbuiev <yurii.shynbuiev@iohk.io>
@yshyn-iohk
style: apply megalinter fixes
3669dc2 
Signed-off-by: Yurii Shynbuiev <yurii.shynbuiev@iohk.io>
@github-actions github-actions bot added the ci label Jun 18, 2024
@yshyn-iohk yshyn-iohk changed the title ci: automerge the changes from the main to the feature branch using squash commit ci: automerge the changes from the main to the feature branch using squash commit [skip ci] Jun 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

Integration Test Results

15 files  15 suites   2s ⏱️
33 tests 33 ✅ 0 💤 0 ❌
46 runs  46 ✅ 0 💤 0 ❌

Results for commit 3669dc2.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 18, 2024 •
edited
Loading

Unit Test Results

 96 files   96 suites   20m 32s ⏱️
826 tests 818 ✅ 8 💤 0 ❌
833 runs  825 ✅ 8 💤 0 ❌

Results for commit 3669dc2.

♻️ This comment has been updated with latest results.

@yshyn-iohk yshyn-iohk added the autoupdate Merge the main branch into a feature branch label Jun 18, 2024
@github-actions GitHub Actions
Copy link
Contributor

The main branch cannot be merged into the feature branch without your help 😢

@yshyn-iohk
ci: add a signature to the commit message
34baba9 
Signed-off-by: Yurii Shynbuiev <yurii.shynbuiev@iohk.io>
@github-actions GitHub Actions
Copy link
Contributor

The main branch cannot be merged into the feature branch without your help 😢

@github-actions GitHub Actions
Copy link
Contributor

The main branch cannot be merged into the feature branch without your help 😢

@yshyn-iohk
ci: add DCO signature to the commit message
ed33059 
Signed-off-by: Yurii Shynbuiev <yurii.shynbuiev@iohk.io>
@github-actions GitHub Actions
Copy link
Contributor

The main branch cannot be merged into the feature branch without your help 😢

@yshyn-iohk
ci: delete ff-merge.yml workflow file
ff7d3a1 
Signed-off-by: Yurii Shynbuiev <yurii.shynbuiev@iohk.io>
@github-actions GitHub Actions
Copy link
Contributor

The main branch cannot be merged into the feature branch without your help 😢

@yshyn-iohk yshyn-iohk enabled auto-merge (squash) June 19, 2024 15:34
@yshyn-iohk yshyn-iohk merged commit 833d6f4 into main Jun 19, 2024
8 of 9 checks passed
@yshyn-iohk yshyn-iohk deleted the ci/fix-auto-merge branch June 19, 2024 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amagyar-iohk amagyar-iohk amagyar-iohk approved these changes

@mineme0110 mineme0110 Awaiting requested review from mineme0110

@patlo-iog patlo-iog Awaiting requested review from patlo-iog

@FabioPinheiro FabioPinheiro Awaiting requested review from FabioPinheiro

Assignees
No one assigned
Labels
autoupdate Merge the main branch into a feature branch ci
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@yshyn-iohk @amagyar-iohk