Uploaded image for project: 'IGB'
  1. IGB
  2. IGBF-3867

Create a release branch without Ensembl code in it

        Details

        • Type: Task
        • Status: Closed (View Workflow)
        • Priority: Major
        • Resolution: Done
        • Affects Version/s: None
        • Fix Version/s: None
        • Labels:
          None

          Description

          Investigate the available options to create a release branch without the Ensembl code in it, either revert the commits or drop them, find out which would be the best suitable option and then create the release branch.

            Attachments

              Issue Links

              blocks

              Task - A task that needs to be done. IGBF-3881 Add samtools filter by and color by options for CR and CB tags

              • Major - Major loss of function.
              • Closed

                Activity

                Ascending order - Click to sort in descending order
                Hide
                Permalink
                jsirigin Jaya Sravani Sirigineedi added a comment - - edited

                After the discussion with Ann Loraine and Nowlan Freese, we have decided on the below approach to create a release branch:

                • First to remove the Ensembl code, we have decided to use the revert option as it keeps the git commit history clean and it allows us to revert the revert to get the original code.
                • To do this, we will be creating a release branch first from the updated main branch and then we will remove the Ensembl code, this way main will have the Ensembl code and the release branch won't and any further bugfixes to the release branch should be merged to main as well (i.e., two PRs for each bugfix).

                This will be done once all the tickets related to UCSC and the Google Analytics are finished and merged into the main. (IGBF-3853, IGBF-3813 and IGBF-3865)

                Show
                jsirigin Jaya Sravani Sirigineedi added a comment - - edited After the discussion with Ann Loraine and Nowlan Freese , we have decided on the below approach to create a release branch: First to remove the Ensembl code, we have decided to use the revert option as it keeps the git commit history clean and it allows us to revert the revert to get the original code. To do this, we will be creating a release branch first from the updated main branch and then we will remove the Ensembl code, this way main will have the Ensembl code and the release branch won't and any further bugfixes to the release branch should be merged to main as well (i.e., two PRs for each bugfix). This will be done once all the tickets related to UCSC and the Google Analytics are finished and merged into the main. ( IGBF-3853 , IGBF-3813 and IGBF-3865)
                Hide
                Permalink
                nfreese Nowlan Freese added a comment -

                I think the two Ensembl commits we need to remove for the candidate release branch are IGBF-3780 and IGBF-3776.

                Show
                nfreese Nowlan Freese added a comment - I think the two Ensembl commits we need to remove for the candidate release branch are IGBF-3780 and IGBF-3776 .
                Hide
                Permalink
                jsirigin Jaya Sravani Sirigineedi added a comment -

                Reverted both the commits and resolved the conflicts here is the updated code: https://bitbucket.org/jaya-sravani/integrated-genome-browser/branch/release-10.1.0. Please review and let me know if there are any issues.

                Show
                jsirigin Jaya Sravani Sirigineedi added a comment - Reverted both the commits and resolved the conflicts here is the updated code: https://bitbucket.org/jaya-sravani/integrated-genome-browser/branch/release-10.1.0 . Please review and let me know if there are any issues.
                Hide
                Permalink
                ann.loraine Ann Loraine added a comment -

                The two reversion commits look good. Assigning to Nowlan Freese to review as well.

                Show
                ann.loraine Ann Loraine added a comment - The two reversion commits look good. Assigning to Nowlan Freese to review as well.
                Hide
                Permalink
                nfreese Nowlan Freese added a comment -

                Two reverts look good to me.
                I pulled Sravani's branch and built with tests and ran IGB without any issues.

                Ready for PR.

                Show
                nfreese Nowlan Freese added a comment - Two reverts look good to me. I pulled Sravani's branch and built with tests and ran IGB without any issues. Ready for PR.
                Hide
                Permalink
                jsirigin Jaya Sravani Sirigineedi added a comment -

                Raised a pull request: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1044

                Show
                jsirigin Jaya Sravani Sirigineedi added a comment - Raised a pull request: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1044
                Hide
                Permalink
                jsirigin Jaya Sravani Sirigineedi added a comment - - edited

                Ann Loraine Here is the new pull request to a new branch in loraine lab workspace: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1045. I have declined the previous pull request.

                Show
                jsirigin Jaya Sravani Sirigineedi added a comment - - edited Ann Loraine Here is the new pull request to a new branch in loraine lab workspace: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1045 . I have declined the previous pull request.
                Hide
                Permalink
                jsirigin Jaya Sravani Sirigineedi added a comment - - edited

                Raised PR to revert the revert commits merged to main unintentionally: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1046

                Show
                jsirigin Jaya Sravani Sirigineedi added a comment - - edited Raised PR to revert the revert commits merged to main unintentionally: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1046
                Hide
                Permalink
                ann.loraine Ann Loraine added a comment -

                PR 1046 (reverting reverts) is merged into main.

                attn: Jaya Sravani Sirigineedi

                Show
                ann.loraine Ann Loraine added a comment - PR 1046 (reverting reverts) is merged into main. attn: Jaya Sravani Sirigineedi
                Hide
                Permalink
                ann.loraine Ann Loraine added a comment -

                Sorry for all the problems Jaya Sravani Sirigineedi and Nowlan Freese!

                New branch is made and available on the team repository now.

                Show
                ann.loraine Ann Loraine added a comment - Sorry for all the problems Jaya Sravani Sirigineedi and Nowlan Freese ! New branch is made and available on the team repository now.
                Hide
                Permalink
                nfreese Nowlan Freese added a comment -

                Downloaded IGB-macos-universal-10.1.0.dmg from Loraine Lab Bitbucket (date: 2024-10-15) and installed on Mac.

                Ensembl does not appear as a data provider in the Data Sources window.

                Closing ticket.

                Show
                nfreese Nowlan Freese added a comment - Downloaded IGB-macos-universal-10.1.0.dmg from Loraine Lab Bitbucket (date: 2024-10-15) and installed on Mac. Ensembl does not appear as a data provider in the Data Sources window. Closing ticket.

                  People

                  • Assignee:
                    jsirigin Jaya Sravani Sirigineedi
                    Reporter:
                    jsirigin Jaya Sravani Sirigineedi
                  • Votes:
                    0 Vote for this issue
                    Watchers:
                    3 Start watching this issue

                    Dates

                    • Created:
                      Updated:
                      Resolved: