Skip to content

Conversation

@arur
Copy link
Contributor

@arur arur commented Oct 20, 2018

Backport: #23551

cc: @addaleax

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
@nodejs-github-bot nodejs-github-bot added async_hooks Issues and PRs related to the async hooks subsystem. test Issues and PRs related to the tests. v10.x labels Oct 20, 2018
Copy link
Member

@addaleax addaleax left a comment

Choose a reason for hiding this comment

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

Thanks!

@arur arur changed the title [v10.x-staging] test: move tick.js from test/async-hooks to test/common [v10.x backport] test: move tick.js from test/async-hooks to test/common Oct 20, 2018
@MylesBorins
Copy link
Contributor

@arur would you be able to rebase this against v10.x-staging please

@arur
Copy link
Contributor Author

arur commented Nov 5, 2018

Hey @MylesBorins, I might need a bit guidance on this. If my understanding is correct here are the steps I need to perform (being on local branch arur:v10.x-staging ):

$ git fetch upstream $ git checkout backport-23551-v10.x $ git rebase origin/v10.x-staging 

I guess I may have conflicts here, so resolve, run tests

$ git push --force 

Please let me know if it is the right way to do. Also, one of the my commits did not pass CI. Does it mean I need to address it somehow? Thanks!

@MylesBorins
Copy link
Contributor

@arur that looks mostly right although you likely want to rebase against upstream/v10.x-staging

@Trott Trott force-pushed the backport-23551-v10.x branch from d978183 to 6f77b5c Compare November 20, 2018 02:45
@Trott
Copy link
Member

Trott commented Nov 20, 2018

@arur that looks mostly right although you likely want to rebase against upstream/v10.x-staging

@MylesBorins I rebased it and pushed up to @arur's branch. Is this landable? Still seems to be a stray commit in there to me, but I could be mistaken about it being stray?

@MylesBorins
Copy link
Contributor

MylesBorins commented Nov 20, 2018

it seems like ffb14e8 had been removed from staging by @addaleax in #23795

maybe they can chime in as to why

@addaleax
Copy link
Member

@MylesBorins I don’t remember the details, but I think there were test failures from that commit?

@MylesBorins
Copy link
Contributor

arur added 3 commits May 16, 2019 00:05
PR-URL: nodejs#23551 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
PR-URL: nodejs#23551 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
@MylesBorins MylesBorins force-pushed the backport-23551-v10.x branch from 6f77b5c to afeeb14 Compare May 16, 2019 04:08
@MylesBorins
Copy link
Contributor

rebased and kicked off CI.

MylesBorins pushed a commit that referenced this pull request May 16, 2019
Backport-PR-URL: #23780 PR-URL: #23551 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
MylesBorins pushed a commit that referenced this pull request May 16, 2019
Backport-PR-URL: #23780 PR-URL: #23551 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
@MylesBorins
Copy link
Contributor

MylesBorins commented May 16, 2019

landed in bc4d717...915ea2a

test failure unrelated

MylesBorins pushed a commit that referenced this pull request May 16, 2019
Backport-PR-URL: #23780 PR-URL: #23551 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
MylesBorins pushed a commit that referenced this pull request May 16, 2019
Backport-PR-URL: #23780 PR-URL: #23551 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

async_hooks Issues and PRs related to the async hooks subsystem. test Issues and PRs related to the tests.

5 participants