chore: Auto merge cherry picked commits to dev #16611
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
atomrc
commented
Jan 24, 2024
| if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}} | ||
| run: gh pr merge --auto --squash "$PR_URL" | ||
| run: gh pr edit ${{ github.event.pull_request.id }} --add-label auto-merge | ||
| env: | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GITHUB_TOKEN: ${{secrets.WEBTEAM_AUTOMERGE_TOKEN}} |
There was a problem hiding this comment.
this logic has been moved to the pr-auto-merge job. Now this job only tags the PR and the other job will do the rest
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## release/q1-2024 #16611 +/- ##
==================================================
Coverage ? 45.53%
==================================================
Files ? 743
Lines ? 24315
Branches ? 5533
==================================================
Hits ? 11072
Misses ? 11826
Partials ? 1417 |
V-Gira
reviewed
Jan 24, 2024
.github/workflows/pr-auto-merge.yml
Outdated
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GITHUB_TOKEN: ${{secrets.WEBTEAM_AUTOMERGE_TOKEN}} | ||
|
|
||
| - name: Enable auto-merge for Dependabot PRs |
There was a problem hiding this comment.
you think renaming that part too would be useful or no?
atomrc
added
auto-merge
otto-the-bot
approved these changes
Jan 24, 2024
github-actions bot
pushed a commit
that referenced
this pull request
Jan 24, 2024
* chore: Auto merge cherry picked commits to dev * fix naming * fix target * fix naming
atomrc
added a commit
that referenced
this pull request
Jan 24, 2024
* chore: Auto merge cherry picked commits to dev * fix naming * fix target * fix naming
atomrc
added a commit
that referenced
this pull request
Jan 29, 2024
* runfix: add e2ei-verification type to expected events (#16554) * runfix: exclude self mls conversation from setting verification state * refactor: simplify if statement * chore: unstuck ci please * chore: Make sure entire repo is fetched when cherry-picking release commits * feat: one2one migrated to mls system message [WPB-6195] (#16560) * feat: add system message for 1:1 conversation migrated to mls * test: check if message was injected * refactor: improve naming * refactor: add check for connection request to conversation selectors * runfix: change type to 1:1 only in init proteus method * runfix: always blacklist proteus 1:1 if its being migrated to mls * refactor: improve naming * docs: type Co-authored-by: Thomas Belin <thomasbelin4@gmail.com> --------- Co-authored-by: Thomas Belin <thomasbelin4@gmail.com> * feat: update download path (#16460) * feat: initial code for listening to feature change * feat: catch team dl path event * feat: small updates for type changes and passing event correctly to wrapper * chore: updates for catching download path on restart * feat: add modal for catching feature changes * test: extend/fix tests * fix: Read indicator design improvements (#16591) * fix: Read indicator desing improvements * add padding-left for reactions * fix cursor * fix: don't load self convo's messages into memory [WPB-6166] (#16589) * fix: don't load self convo's messages into memory * [tmp] * test: update tests * refactor: improve naming * test: fix tests * test: simplify generating a convo * refactor: Remove oidcproxy (#16596) * fix: when grace period is over select the enrollment type based on certificate availability (#16599) * chore: upgrade CoreCrypto to rc31 (#16598) * ci: set more fields and retry (#16586) * feat: bump core with new core-crypto (#16603) * fix: read indicator images improvements (#16605) * fix: read indicator images improvements * fixes * fix image asset width * runfix: Fix enrolling to e2ei with non-ascii user name (#16607) * chore: Fix running CI jobs on cherry-picked commits (#16609) * chore: Auto merge cherry picked commits to dev (#16611) * chore: Auto merge cherry picked commits to dev * fix naming * fix target * fix naming * chore: Fix permission for flagging auto cherry picked PR * test: gh ci test * test: revert gh ci test This reverts commit 757aa10. * chore: Fix permission for cherry-pick job * chore: fix tagging auto merge PR * chore: use github token to auto approve PR * chore: Auto merge PR from otto-the-bot and dependabot (#16616) * chore: Auto merge PR from otto-the-bot and dependabot * removeme * fix config * fixup * fix: Enforce download path change if featureStatus is not changed (#16623) * feat: show modal if feature status unchanged * fix: test/functionality * chore: Trigger publish job on release branches (#16624) * chore: Fix docker images tag no slashes are allowed in quay.io image tags * runfix: Deregister the single instance of the app as late as possible (#16627) * runfix: address read indicator design review (WPB-5369) (#16629) * runfix: assign max-width to all assets * remove read indicator from message header * feat: group messages sent within a short timeframe (WPB-6237) (#16631) * feat: group messages sent within a short timeframe (WPB-6237) * use TIME_IN_MILLIS util * chore: Make cherry-pick PR title semantically correct (#16632) * chore: Fix renaming PR job * chore: fix action token * chore: fix renaming job access token * chore: Make sure we have the repo when renaming PR * chore: use PR urls * runfix: position system message timestamps correctly (#16640) * feat: Do not load all team members on app load [WPB-4553 WPB-4548] (#16160) (#16258) * feat: Do not load all team members on app load [WPB-4553 WPB-4548 WPB-1912] (#16160) * fix: bring back subscribing to team members changes * fix e2eiHandler error --------- Co-authored-by: Thomas Belin <thomasbelin4@gmail.com> * feat(e2ei): link renew certificate action with UI button (#16643) * feat(e2ei): link cert renewal with ui button * chore: remove comment * fix: tests * runfix: make assets use all available width (#16646) * feat: client certificate revocation list [WPB-3232] (#16649) * feat: handle conversation state every time crl changes * feat: show modal if self client's cert is revoked * test: fix tests by updating mocks * runfix: cover validating slef crl with try catch * chore: remove node script * chore: bump core * runfix: bump core with rolled back core-crypto to vrc33 * feat: client certificate revocation list [WPB-3232] (#16649) * feat: handle conversation state every time crl changes * feat: show modal if self client's cert is revoked * test: fix tests by updating mocks * runfix: cover validating slef crl with try catch * chore: remove node script * chore: bump core * runfix: bump core with rolled back core-crypto to vrc33 * runfix: address read indicator design review (WPB-5369) (#16629) * runfix: assign max-width to all assets * remove read indicator from message header * chore: Make cherry-pick PR title semantically correct (#16632) * chore: Fix renaming PR job * chore: fix renaming job access token --------- Co-authored-by: Patryk Górka <patrykbunix@gmail.com> Co-authored-by: Timothy LeBon <tlebon@gmail.com> Co-authored-by: Przemysław Jóźwik <przemyslaw.jozwik96@gmail.com> Co-authored-by: Arjita <arjitamitra3@gmail.com> Co-authored-by: Stefan Matting <smatting@users.noreply.github.com> Co-authored-by: Virgile <78490891+V-Gira@users.noreply.github.com> Co-authored-by: Amir Ghezelbash <thisisamir98@gmail.com> Co-authored-by: Adrian Weiß <77456193+aweiss-dev@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This will make sure cherry-picked commits from release branches to
devwill be auto merged once CI is green.This also refactors the logic to auto merge dependabot PR (it will now add the
auto-mergeflag that will trigger the newpr-auto-mergejob)Checklist