Skip to content

fix: Supported Versions misbehaving#32610

Merged
ggazzo merged 11 commits intodevelopfrom
fix/license
Jun 18, 2024
Merged

fix: Supported Versions misbehaving#32610
ggazzo merged 11 commits intodevelopfrom
fix/license

Conversation

@ggazzo
Copy link
Copy Markdown
Member

@ggazzo ggazzo commented Jun 14, 2024

#32600
CONN-254

It seems that one of the conditions was wrong, always having the oldest sync

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 14, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Jun 14, 2024

🦋 Changeset detected

Latest commit: 24b463f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@codecov
Copy link
Copy Markdown

codecov bot commented Jun 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.45%. Comparing base (ffbbd8c) to head (24b463f).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32610      +/-   ##
===========================================
+ Coverage    56.42%   56.45%   +0.02%     
===========================================
  Files         2481     2482       +1     
  Lines        54616    54620       +4     
  Branches     11283    11283              
===========================================
+ Hits         30816    30834      +18     
- Misses       21118    21137      +19     
+ Partials      2682     2649      -33     
Flag Coverage Δ
unit 72.05% <100.00%> (+0.07%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@ggazzo ggazzo changed the title fix: License latest issue fix: license sync issues Jun 14, 2024
@ggazzo ggazzo changed the title fix: license sync issues fix: Supported Versions misbehaving Jun 14, 2024
@ggazzo ggazzo marked this pull request as ready for review June 14, 2024 14:54
@ggazzo ggazzo added this to the 6.10 milestone Jun 14, 2024
@tassoevan tassoevan added the stat: QA assured Means it has been tested and approved by a company insider label Jun 18, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 18, 2024
@ggazzo ggazzo merged commit b23f9ed into develop Jun 18, 2024
@ggazzo ggazzo deleted the fix/license branch June 18, 2024 14:32
@ggazzo
Copy link
Copy Markdown
Member Author

ggazzo commented Jun 18, 2024

/patch

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 18, 2024

Pull request #32621 added to Project: "Patch 6.9.2"

@ggazzo
Copy link
Copy Markdown
Member Author

ggazzo commented Jun 18, 2024

/backport 6.8.2

@ggazzo
Copy link
Copy Markdown
Member Author

ggazzo commented Jun 18, 2024

/backport 6.7.5

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 18, 2024

Pull request #32623 added to Project: "Patch 6.8.2"

@ggazzo
Copy link
Copy Markdown
Member Author

ggazzo commented Jun 18, 2024

/backport 6.6.10

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 18, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.7.5-32610
git cherry-pick b23f9ed91ab21ad83ff01bc512fafc0c9987a3e5
// solve the conflict
git push

after that just run /backport 6.7.5 again

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 18, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.6.10-32610
git cherry-pick b23f9ed91ab21ad83ff01bc512fafc0c9987a3e5
// solve the conflict
git push

after that just run /backport 6.6.10 again

@ggazzo
Copy link
Copy Markdown
Member Author

ggazzo commented Jun 18, 2024

/backport 6.5.8

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 18, 2024

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-6.5.8-32610
git cherry-pick b23f9ed91ab21ad83ff01bc512fafc0c9987a3e5
// solve the conflict
git push

after that just run /backport 6.5.8 again

ggazzo added a commit that referenced this pull request Jun 19, 2024
@ggazzo
Copy link
Copy Markdown
Member Author

ggazzo commented Jun 19, 2024

/backport 6.7.5

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 19, 2024

Pull request #32629 added to Project: "Patch 6.7.5"

ggazzo added a commit that referenced this pull request Jun 19, 2024
@ggazzo
Copy link
Copy Markdown
Member Author

ggazzo commented Jun 19, 2024

/backport 6.6.10

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 19, 2024

Pull request #32630 added to Project: "Patch 6.6.10"

ggazzo added a commit that referenced this pull request Jun 19, 2024
@ggazzo
Copy link
Copy Markdown
Member Author

ggazzo commented Jun 19, 2024

/backport 6.5.8

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Jun 19, 2024

Pull request #32631 added to Project: "Patch 6.5.8"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants