Re: Weird discrepency between main and 1.5.5
Ah I see, looking at the graph, I see that the reason I see the commit tagged for 1.5.5 in main is a merge right after the release. Thanks for the explanation, I'll patiently wait for 1.6.0 to start using guacamole From: Nick Couchman Sent: Tuesday, April 16, 2024 17:48 To: user@guacamole.apache.org Subject: Re: Weird discrepency between main and 1.5.5 On Tue, Apr 16, 2024 at 11:46 AM Nick Couchman wrote: On Tue, Apr 16, 2024 at 11:38 AM Demarteau Benjamin wrote: Hello, I was looking to get the code written in 2022 for GUACAMOLE-1372 [1] and [2] and somehow don't see it in the 1.5.5 release from 2 weeks ago. I'm really weirded out by this. If you look at the diff between 1.5.5 and main [3], there are 436 commits since 1.5.5 while there were only 16 or so if you look at the commits from main [4]. Does the team have any insight into this ? Yes - we do not necessarily place all of the commits in our git repo in the latest release. The 1.5.5 release was a bug fix release for the 1.5.x series, so the only Jira issues and commits included in it are ones that were specifically designed to address bugs in the 1.5.x code, and not any that would introduce new functionality or features. As such, the staging/1.5.5 branch, which contained the changes for the 1.5.5 release, really comes out of the 1.5.0 release back in early 2023, which was started in 2022. The pull requests you referenced, and their associated Jira issues, are going into the main branch (formerly the master branch), and will target (mostly) the 1.6.0 version. We also have a couple of issues out there that will go into the next branch, instead of the main branch, because they are targeted at the next major release of Guacamole, likely 2.0.0. Here's the Jira issue, for reference - you can see it marked for the "1.6.0" release: https://issues.apache.org/jira/browse/GUACAMOLE-1372
Re: Weird discrepency between main and 1.5.5
On Tue, Apr 16, 2024 at 11:46 AM Nick Couchman wrote: > On Tue, Apr 16, 2024 at 11:38 AM Demarteau Benjamin > wrote: > >> Hello, >> >> I was looking to get the code written in 2022 for GUACAMOLE-1372 [1] and >> [2] and somehow don't see it in the 1.5.5 release from 2 weeks ago. >> >> I'm really weirded out by this. If you look at the diff between 1.5.5 and >> main [3], there are 436 commits since 1.5.5 while there were only 16 or so >> if you look at the commits from main [4]. >> >> Does the team have any insight into this ? >> >> > Yes - we do not necessarily place all of the commits in our git repo in > the latest release. > > The 1.5.5 release was a bug fix release for the 1.5.x series, so the only > Jira issues and commits included in it are ones that were specifically > designed to address bugs in the 1.5.x code, and not any that would > introduce new functionality or features. As such, the staging/1.5.5 branch, > which contained the changes for the 1.5.5 release, really comes out of the > 1.5.0 release back in early 2023, which was started in 2022. > > The pull requests you referenced, and their associated Jira issues, are > going into the main branch (formerly the master branch), and will target > (mostly) the 1.6.0 version. We also have a couple of issues out there that > will go into the next branch, instead of the main branch, because they are > targeted at the next major release of Guacamole, likely 2.0.0. > > Here's the Jira issue, for reference - you can see it marked for the "1.6.0" release: https://issues.apache.org/jira/browse/GUACAMOLE-1372 >
Re: Weird discrepency between main and 1.5.5
On Tue, Apr 16, 2024 at 11:38 AM Demarteau Benjamin wrote: > Hello, > > I was looking to get the code written in 2022 for GUACAMOLE-1372 [1] and > [2] and somehow don't see it in the 1.5.5 release from 2 weeks ago. > > I'm really weirded out by this. If you look at the diff between 1.5.5 and > main [3], there are 436 commits since 1.5.5 while there were only 16 or so > if you look at the commits from main [4]. > > Does the team have any insight into this ? > > Yes - we do not necessarily place all of the commits in our git repo in the latest release. The 1.5.5 release was a bug fix release for the 1.5.x series, so the only Jira issues and commits included in it are ones that were specifically designed to address bugs in the 1.5.x code, and not any that would introduce new functionality or features. As such, the staging/1.5.5 branch, which contained the changes for the 1.5.5 release, really comes out of the 1.5.0 release back in early 2023, which was started in 2022. The pull requests you referenced, and their associated Jira issues, are going into the main branch (formerly the master branch), and will target (mostly) the 1.6.0 version. We also have a couple of issues out there that will go into the next branch, instead of the main branch, because they are targeted at the next major release of Guacamole, likely 2.0.0. So, the behavior you're seeing is entirely normal and intended. -Nick
Weird discrepency between main and 1.5.5
Hello, I was looking to get the code written in 2022 for GUACAMOLE-1372 [1] and [2] and somehow don't see it in the 1.5.5 release from 2 weeks ago. I'm really weirded out by this. If you look at the diff between 1.5.5 and main [3], there are 436 commits since 1.5.5 while there were only 16 or so if you look at the commits from main [4]. Does the team have any insight into this ? Best, Benjamin [1] https://github.com/apache/guacamole-client/pull/741 [2] https://github.com/apache/guacamole-client/pull/748 [3] https://github.com/apache/guacamole-client/compare/df6f9f3...main [4] https://github.com/apache/guacamole-client/commits/main/ - To unsubscribe, e-mail: user-unsubscr...@guacamole.apache.org For additional commands, e-mail: user-h...@guacamole.apache.org
