[IGBF-3867] Create a release branch without Ensembl code in it - JIRA UNCC

Details

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

Story Points:
0.5
Epic Link:
Release IGB 10.1.0
Sprint:
Summer 7, Fall 1, Fall 2, Fall 3

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

IGBF-3881 Add samtools filter by and color by options for CR and CB tags

Closed

Activity

Ascending order - Click to sort in descending order

Hide

Permalink

Jaya Sravani Sirigineedi added a comment - 19/Aug/24 9:49 AM - 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

Jaya Sravani Sirigineedi added a comment - 19/Aug/24 9:49 AM - 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)

5 older comments

Hide

Permalink

Jaya Sravani Sirigineedi added a comment - 09/Oct/24 11:29 AM - 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

Jaya Sravani Sirigineedi added a comment - 09/Oct/24 11:29 AM - 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

Jaya Sravani Sirigineedi added a comment - 09/Oct/24 11:55 AM - edited

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

Show

Jaya Sravani Sirigineedi added a comment - 09/Oct/24 11:55 AM - 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 added a comment - 09/Oct/24 12:14 PM

PR 1046 (reverting reverts) is merged into main.

attn: Jaya Sravani Sirigineedi

Show

Ann Loraine added a comment - 09/Oct/24 12:14 PM PR 1046 (reverting reverts) is merged into main. attn: Jaya Sravani Sirigineedi

Hide

Permalink

Ann Loraine added a comment - 09/Oct/24 2:06 PM

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 added a comment - 09/Oct/24 2:06 PM Sorry for all the problems Jaya Sravani Sirigineedi and Nowlan Freese ! New branch is made and available on the team repository now.

Hide

Permalink

Nowlan Freese added a comment - 16/Oct/24 2:46 PM

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

Nowlan Freese added a comment - 16/Oct/24 2:46 PM 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:

Jaya Sravani Sirigineedi

Reporter:

Jaya Sravani Sirigineedi

Votes:

0 Vote for this issue

Watchers:

3 Start watching this issue

Dates

Created:

16/Aug/24 9:56 AM

Updated:

16/Oct/24 2:46 PM

Resolved:

16/Oct/24 2:46 PM