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.

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

WIP: chore: updates Node to v16 (BKTCLT-3) #226

Open
wants to merge 11 commits into
base: development/7.4
Choose a base branch
from

Conversation

george-the-wizard
Copy link

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Oct 18, 2021

Hello george-the-wizard,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 18, 2021

Incorrect fix version

The Fix Version/s in issue BKTCLT-3 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.1

  • 7.4.10

  • 8.1.1

Please check the Fix Version/s of BKTCLT-3, or the target
branch of this pull request.

@george-the-wizard george-the-wizard requested review from tcarmet and jonathan-gramain and removed request for tcarmet October 18, 2021 16:39
@george-the-wizard george-the-wizard changed the title WIP: chore: updates Node to v16 (BKTCLT-3) chore: updates Node to v16 (BKTCLT-3) Oct 18, 2021
@bert-e
Copy link
Contributor

bert-e commented Oct 19, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/feature/BKTCLT-3/upgrade-to-node16 with contents from w/7.10/feature/BKTCLT-3/upgrade-to-node16
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/feature/BKTCLT-3/upgrade-to-node16 origin/development/8.1
 $ git merge origin/w/7.10/feature/BKTCLT-3/upgrade-to-node16
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/feature/BKTCLT-3/upgrade-to-node16

@bert-e
Copy link
Contributor

bert-e commented Nov 3, 2021

Incorrect fix version

The Fix Version/s in issue BKTCLT-3 contains:

  • 7.10.1

  • 7.4.10

  • 8.1.1

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.2

  • 7.4.10

  • 8.1.1

Please check the Fix Version/s of BKTCLT-3, or the target
branch of this pull request.

@george-the-wizard
Copy link
Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Nov 3, 2021

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Nov 3, 2021

Incorrect fix version

The Fix Version/s in issue BKTCLT-3 contains:

  • 7.10.1

  • 7.4.10

  • 8.1.1

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.2

  • 7.4.10

  • 8.1.1

Please check the Fix Version/s of BKTCLT-3, or the target
branch of this pull request.

@@ -0,0 +1,8 @@
module.exports = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should add prettier at the same time as a node upgrade, maybe a separate PR

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. @george-the-wizard please focus on upgrading the code to be compatible with Node 16 and any additional work can be followed up later.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@miniscruff @rahulreddy I needed it in order to be able to troubleshoot the issues efficiently, I will revert the related changes after it builds flawlessly - thx

@george-the-wizard george-the-wizard changed the title chore: updates Node to v16 (BKTCLT-3) WIP: chore: updates Node to v16 (BKTCLT-3) Nov 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants