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

chore(release): pull main into develop post release v1.54.0 (Duplicate version) #960

Merged
merged 1 commit into from
Oct 11, 2023
Merged

chore(release): pull main into develop post release v1.54.0 (Duplicate version) #960

merged 1 commit into from
Oct 11, 2023

Conversation

anantjain45823
Copy link
Contributor

Description of the change

< Description >

Checklists

Development

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • The code changed/added as part of this pull request has been covered with tests
  • All tests related to the changed code pass in development

Code review

  • This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
  • Changes have been reviewed by at least one other engineer
  • Issue from task tracker has a link to this pull request

@devops-github-rudderstack @MoumitaM
@ItsSudip @shrouti1507 @am6010 @sensei23 @github-actions @ashishRudder @krishna2020 @anantjain45823 @web-flow @mihir-4116
chore(release): pull release/v1.54.0 into main (#951)
36b4b50 
Co-authored-by: Moumita <36885121+MoumitaM@users.noreply.github.com>
Co-authored-by: Moumita Mandal <moumita@Moumitas-MacBook-Pro-2.local>
Co-authored-by: Sudip Paul <67197965+ItsSudip@users.noreply.github.com>
Co-authored-by: shrouti1507 <60211312+shrouti1507@users.noreply.github.com>
Co-authored-by: Alexandros Milaios <alexmilaios@gmail.com>
Co-authored-by: Shreyash Agrawal <35464275+sensei23@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ashishRudder <ashish@rudderstack.com>
Co-authored-by: Krishna Chaitanya <chaithu.kitti@gmail.com>
Co-authored-by: Anant Jain <62471433+anantjain45823@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: mihir-4116 <mihirb@rudderstack.com>
Co-authored-by: Mihir Bhalala <77438541+mihir-4116@users.noreply.github.com>
@krishna2020 krishna2020 changed the title chore(release): pull release/v1.54.0 into main (#951) chore(release): pull main into develop post release v1.54.0 (Duplicate version) Oct 11, 2023
@krishna2020
Copy link
Collaborator

Though there are no file changes need to get merged, there's difference in the commit history of both develop & main. Once this PR gets merged, main commits would be available in develop branch.

Timeline:
As on Sep 28th, main version is at 1.53.1
Sep 29th Morning - Regular Release branch got cut with version 1.54.0
Sep 29th Evening - Hotfix branch got cut with version 1.54.0
Sep 30th - Hotfix got released & main version got updated to 1.54.0
Oct 3rd - Regular release also has been done without getting the hotfix changes merged to release branch. Effectively, this release also went other same version 1.54.0

@krishna2020 krishna2020 merged commit 4a633b4 into develop Oct 11, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shrouti1507 shrouti1507 shrouti1507 approved these changes

@krishna2020 krishna2020 krishna2020 approved these changes

@lvrach lvrach Awaiting requested review from lvrach lvrach is a code owner

@cisse21 cisse21 Awaiting requested review from cisse21 cisse21 is a code owner

@nidhilashkari17 nidhilashkari17 Awaiting requested review from nidhilashkari17

@debanjan97 debanjan97 Awaiting requested review from debanjan97 debanjan97 is a code owner

@ssbeefeater ssbeefeater Awaiting requested review from ssbeefeater ssbeefeater is a code owner

@AchuthaSourabhC AchuthaSourabhC Awaiting requested review from AchuthaSourabhC

@ruchiramoitra ruchiramoitra Awaiting requested review from ruchiramoitra ruchiramoitra is a code owner

@ashishRudder ashishRudder Awaiting requested review from ashishRudder

@ItsSudip ItsSudip Awaiting requested review from ItsSudip ItsSudip is a code owner

@sandeepdsvs sandeepdsvs Awaiting requested review from sandeepdsvs sandeepdsvs is a code owner

@desusai7 desusai7 Awaiting requested review from desusai7

@1abhishekpandey 1abhishekpandey Awaiting requested review from 1abhishekpandey 1abhishekpandey is a code owner

@bardisg bardisg Awaiting requested review from bardisg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@anantjain45823 @krishna2020 @shrouti1507 @devops-github-rudderstack