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: only rebuild docker if event is pull request and is from outside #32997

Merged
merged 1 commit into from
Aug 7, 2024
Merged

ci: only rebuild docker if event is pull request and is from outside #32997

merged 1 commit into from
Aug 7, 2024

Conversation

ggazzo
Copy link
Member

@ggazzo ggazzo commented Aug 7, 2024

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Aug 7, 2024 •
edited
Loading

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is missing the 'stat: QA assured' label

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Aug 7, 2024

⚠️ No Changeset found

Latest commit: ebc8f03

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

@ggazzo ggazzo marked this pull request as ready for review August 7, 2024 03:46
@ggazzo ggazzo requested a review from a team as a code owner August 7, 2024 03:46
@ggazzo ggazzo added this to the 6.12 milestone Aug 7, 2024
@ggazzo ggazzo merged commit 45f0bc7 into develop Aug 7, 2024
8 of 9 checks passed
@ggazzo ggazzo deleted the ci/dont-build-docker-on-develop-for-tests branch August 7, 2024 03:47
ggazzo added a commit that referenced this pull request Aug 7, 2024
@ggazzo
ci: only rebuild docker if event is pull request and is from outside (#…
72792c1 
…32997)
gabriellsh added a commit that referenced this pull request Aug 8, 2024
@gabriellsh
Merge branch 'improve/threadMetrics' of github.com:RocketChat/Rocket.…
a7f92ae 
…Chat into improve/threadMetrics

* 'improve/threadMetrics' of github.com:RocketChat/Rocket.Chat:
  ci: Bump `@actions/download-artifact` and `@actions/upload-artifact` (#32930)
  fix: Allow custom fields on messages to be updated even if `msg` prop is not updated (via API) (#32791)
  test: Make Omnichannel jobs run every 3 secs on CI instead of 1 min (#32967)
  ci: only rebuild docker if event is pull request and is from outside (#32997)
  ci: remove tmp files (#32996)
  test: Mock `dns.lookup` on `checkUrlForSsrf` tests (#32995)
  chore: `FilterByText` component sanitization (#32957)
  chore: Renders back button through prop in admin settings (#32987)
  feat: add `sidepanel` to teams api (#32868)
  chore: don't mark room as read after sending message (#32941)
  chore: replace `dtinth/setup-github-actions-caching-for-turbo` to use `rhark… (#32990)
@ggazzo
Copy link
Member Author

ggazzo commented Aug 16, 2024

/backport 6.10.3

@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Aug 16, 2024

6.10.3 already exists in the project

@ggazzo
Copy link
Member Author

ggazzo commented Aug 16, 2024

/backport 6.10.3

@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Aug 16, 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.10.3-32997
git cherry-pick 45f0bc70699f5df184ed848453ec6b85c7862201
// solve the conflict
git push

after that just run /backport 6.10.3 again

ggazzo added a commit that referenced this pull request Aug 16, 2024
@ggazzo
ci: only rebuild docker if event is pull request and is from outside (#…
cfc56e6 
…32997)
@ggazzo
Copy link
Member Author

ggazzo commented Aug 16, 2024

/backport 6.10.3

@dionisio-bot dionisio-bot bot mentioned this pull request Aug 16, 2024
Merged
@dionisio-bot dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Aug 16, 2024

Pull request #33073 added to Project: "Patch 6.10.3"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
6.12
Development

Successfully merging this pull request may close these issues.
1 participant
@ggazzo